Merge branch 'master' into hazeZone

interface/resources/qml/hifi/toolbars/Toolbar.qml

@@ -19,7 +19,6 @@ Window {
     shown: true
     width: content.width
     height: content.height
-    disableFade: true
     // Disable this window from being able to call 'desktop.raise() and desktop.showDesktop'
     activator: Item {}
     property bool horizontal: true
@@ -127,7 +126,7 @@ Window {
 
         sortButtons();
 
-        shown = true;
+        fadeIn(null);
 
         return result;
     }
@@ -143,7 +142,7 @@ Window {
         buttons.splice(index, 1);
 
         if (buttons.length === 0) {
-            shown = false;
+            fadeOut(null);
         }
     }
 }

interface/resources/qml/windows/Fadable.qml

@@ -36,9 +36,6 @@ FocusScope {
     // Some dialogs should be destroyed when they become
     // invisible, so handle that
     onVisibleChanged: {
-        if (disableFade) {
-            return;
-        }
         // If someone directly set the visibility to false
         // toggle it back on and use the targetVisible flag to transition
         // via fading.
@@ -66,9 +63,7 @@ FocusScope {
     }
 
     onFadeTargetPropertyChanged: {
-        if (!disableFade) {
-            visible = (fadeTargetProperty != 0.0);
-        }
+        visible = (fadeTargetProperty != 0.0);
     }
 
     function fadeIn(callback) {

libraries/baking/src/FBXBaker.cpp

@@ -377,7 +377,8 @@ void FBXBaker::rewriteAndBakeSceneModels() {
                     bool hasColors { mesh.colors.size() > 0 };
                     bool hasTexCoords { mesh.texCoords.size() > 0 };
                     bool hasTexCoords1 { mesh.texCoords1.size() > 0 };
-                    bool hasPerFaceMaterials { mesh.parts.size() > 1 };
+                    bool hasPerFaceMaterials { mesh.parts.size() > 1
+                        || extractedMesh.partMaterialTextures[0].first != 0 };
                     bool needsOriginalIndices { hasDeformers };
 
                     int normalsAttributeID { -1 };
@@ -594,6 +595,10 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
                             QString fbxTextureFileName { textureChild.properties.at(0).toByteArray() };
                             QFileInfo textureFileInfo { fbxTextureFileName.replace("\\", "/") };
 
+                            if (hasErrors()) {
+                                return;
+                            }
+
                             if (textureFileInfo.suffix() == BAKED_TEXTURE_EXT.mid(1)) {
                                 // re-baking an FBX that already references baked textures is a fail
                                 // so we add an error and return from here
@@ -602,6 +607,11 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
                                 return;
                             }
 
+                            if (!TextureBaker::getSupportedFormats().contains(textureFileInfo.suffix())) {
+                                // this is a texture format we don't bake, skip it
+                                handleWarning(fbxTextureFileName + " is not a bakeable texture format");
+                                continue;
+                            }
 
                             // make sure this texture points to something and isn't one we've already re-mapped
                             if (!textureFileInfo.filePath().isEmpty()) {