Merge branch 'blackProp' of github.com:samcake/hifi into blackProp

interface/src/Application.cpp

@@ -9320,6 +9320,3 @@ void Application::toggleAwayMode(){
 
 
 #endif
-
-
-#include "Application.moc"

interface/src/Menu.cpp

@@ -707,8 +707,7 @@ Menu::Menu() {
     // Developer > Timing >>>
     MenuWrapper* timingMenu = developerMenu->addMenu("Timing");
     MenuWrapper* perfTimerMenu = timingMenu->addMenu("Performance Timer");
-    addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::DisplayDebugTimingDetails, 0, false,
+    addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::DisplayDebugTimingDetails);
-            qApp, SLOT(enablePerfStats(bool)));
     addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::OnlyDisplayTopTen, 0, true);
     addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::ExpandUpdateTiming, 0, false);
     addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::ExpandSimulationTiming, 0, false);

libraries/baking/src/FBXBaker.cpp

@@ -104,13 +104,15 @@ void FBXBaker::rewriteAndBakeSceneModels(const QVector<hfm::Mesh>& meshes, const
     int meshIndex = 0;
     for (FBXNode& rootChild : _rootNode.children) {
         if (rootChild.name == "Objects") {
-            for (auto object = rootChild.children.begin(); object != rootChild.children.end(); object++) {
+            auto object = rootChild.children.begin();
+            while (object != rootChild.children.end()) {
                 if (object->name == "Geometry") {
                     if (object->properties.at(2) == "Mesh") {
                         int meshNum = meshIndexToRuntimeOrder[meshIndex];
                         replaceMeshNodeWithDraco(*object, dracoMeshes[meshNum], dracoMaterialLists[meshNum]);
                         meshIndex++;
                     }
+                    object++;
                 } else if (object->name == "Model") {
                     for (FBXNode& modelChild : object->children) {
                         if (modelChild.name == "Properties60" || modelChild.name == "Properties70") {
@@ -136,9 +138,12 @@ void FBXBaker::rewriteAndBakeSceneModels(const QVector<hfm::Mesh>& meshes, const
                             meshIndex++;
                         }
                     }
+                    object++;
                 } else if (object->name == "Texture" || object->name == "Video") {
                     // this is an embedded texture, we need to remove it from the FBX
                     object = rootChild.children.erase(object);
+                } else {
+                    object++;
                 }
 
                 if (hasErrors()) {

libraries/render-utils/src/Model.cpp

@@ -1572,9 +1572,13 @@ void Model::applyMaterialMapping() {
 
     auto& materialMapping = getMaterialMapping();
     for (auto& mapping : materialMapping) {
-        std::set<unsigned int> shapeIDs = getMeshIDsFromMaterialID(QString(mapping.first.c_str()));
         auto networkMaterialResource = mapping.second;
-        if (!networkMaterialResource || shapeIDs.size() == 0) {
+        if (!networkMaterialResource) {
+            continue;
+        }
+
+        std::set<unsigned int> shapeIDs = getMeshIDsFromMaterialID(QString(mapping.first.c_str()));
+        if (shapeIDs.size() == 0) {
             continue;
         }
 

tools/CMakeLists.txt

@@ -21,8 +21,8 @@ endfunction()
 if (BUILD_TOOLS)
     # Allow different tools for stable builds
     if (STABLE_BUILD)
-        set(ALL_TOOLS 
+        set(ALL_TOOLS
-            udt-test 
+            udt-test
             vhacd-util
             frame-optimizer
             gpu-frame-player
@@ -34,8 +34,8 @@ if (BUILD_TOOLS)
             oven
         )
     else()
-        set(ALL_TOOLS 
+        set(ALL_TOOLS
-            udt-test 
+            udt-test
             vhacd-util
             frame-optimizer
             gpu-frame-player
@@ -48,7 +48,7 @@ if (BUILD_TOOLS)
             nitpick
         )
     endif()
-    
+
     foreach(TOOL ${ALL_TOOLS})
         check_test(${TOOL})
         if (${BUILD_TOOL_RESULT})

tools/oven/CMakeLists.txt

@@ -18,6 +18,4 @@ elseif (APPLE)
   set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
 endif()
 
-if (BUILD_SERVER)
+install_beside_console()
-  install_beside_console()
-endif ()

tools/vhacd-util/CMakeLists.txt

@@ -12,7 +12,9 @@ target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES})
 
 setup_memory_debugger()
 
-if (UNIX AND NOT APPLE)
+if (WIN32)
+  package_libraries_for_deployment()
+elseif (UNIX AND NOT APPLE)
   include(FindOpenMP)
   if(OPENMP_FOUND)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
@@ -20,3 +22,5 @@ if (UNIX AND NOT APPLE)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
   endif()
 endif ()
+
+install_beside_console()