Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-24636-1.2.0b1-forum-release

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -294,7 +294,7 @@ private static string DefaultIntegrationSavePath {
         /// </summary>
         public static string[] DCCVendorLocations {
             get{
-                var environmentVariable = Environment.GetEnvironmentVariable("UNITY_FBX_3DAPP_VENDOR_LOCATIONS");
+                var environmentVariable = Environment.GetEnvironmentVariable("UNITY_3DAPP_VENDOR_LOCATIONS");
                 if (environmentVariable != null)
                 {
                     string[] locations = environmentVariable.Split(';');
@@ -410,6 +410,11 @@ public void SetDCCOptionNames(List<string> newList)
             dccOptionNames = newList;
         }
 
+        public void SetDCCOptionPaths(List<string> newList)
+        {
+            dccOptionPaths = newList;
+        }
+
         public void ClearDCCOptionNames()
         {
             dccOptionNames.Clear();

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -825,18 +825,6 @@ protected bool ExportCamera (GameObject unityGO, FbxScene fbxScene, FbxNode fbxN
                 fbxCamera.SetFarPlane (unityCamera.farClipPlane*UnitScaleFactor);
                 #endregion
 
-                // Export backgroundColor as a custom property
-                // NOTE: export on fbxNode so that it will show up in Maya
-                ExportColorProperty (fbxNode, unityCamera.backgroundColor,
-                    MakeName("backgroundColor"), 
-                    "The color with which the screen will be cleared.");
-
-                // Export clearFlags as a custom property
-                // NOTE: export on fbxNode so that it will show up in Maya
-                ExportIntProperty (fbxNode, (int)unityCamera.clearFlags,
-                    MakeName("clearFlags"), 
-                    "How the camera clears the background.");
-
                 fbxNode.SetNodeAttribute (fbxCamera);
 
                 // set +90 post rotation to counteract for FBX camera's facing +X direction by default
@@ -861,47 +849,6 @@ protected void SetDefaultCamera (FbxScene fbxScene)
                 fbxScene.GetGlobalSettings ().SetDefaultCamera (DefaultCamera);
             }
 
-            /// <summary>
-            /// Export Component's color property
-            /// </summary>
-            bool ExportColorProperty (FbxObject fbxObject, Color value, string name, string label)
-            {
-                // create a custom property for component value
-                var fbxProperty = FbxProperty.Create (fbxObject, Globals.FbxColor4DT, name, label);
-                if (!fbxProperty.IsValid ()) {
-                    throw new System.NullReferenceException ();
-                }
-
-                FbxColor fbxColor = new FbxColor(value.r, value.g, value.b, value.a );
-
-                fbxProperty.Set (fbxColor);
-
-                // Must be marked user-defined or it won't be shown in most DCCs
-                fbxProperty.ModifyFlag (FbxPropertyFlags.EFlags.eUserDefined, true);
-                fbxProperty.ModifyFlag (FbxPropertyFlags.EFlags.eAnimatable, true);
-
-                return true;
-            }
-
-            /// <summary>
-            /// Export Component's int property
-            /// </summary>
-            bool ExportIntProperty (FbxObject fbxObject, int value, string name, string label)
-            {
-                // create a custom property for component value
-                var fbxProperty = FbxProperty.Create (fbxObject, Globals.FbxIntDT, name, label);
-                if (!fbxProperty.IsValid ()) {
-                    throw new System.NullReferenceException ();
-                }
-                fbxProperty.Set (value);
-
-                // Must be marked user-defined or it won't be shown in most DCCs
-                fbxProperty.ModifyFlag (FbxPropertyFlags.EFlags.eUserDefined, true);
-                fbxProperty.ModifyFlag (FbxPropertyFlags.EFlags.eAnimatable, true);
-
-                return true;
-            }
-
             /// <summary>
             /// Ensures that the inputted name is unique.
             /// If a duplicate name is found, then it is incremented.
@@ -1318,6 +1265,9 @@ private void ReplaceFile ()
                 } catch (IOException) {
                 }
 
+                // refresh the database so Unity knows the file's been deleted
+                AssetDatabase.Refresh();
+
                 if (File.Exists (m_lastFilePath)) {
                     Debug.LogWarning ("Failed to delete file: " + m_lastFilePath);
                 }

Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs

@@ -213,5 +213,56 @@ public void TestFindPreferredProgram()
             Assert.AreEqual(preferred, -1);
         }
 
+        [Test]
+        public void TestGetDCCOptions()
+        {
+            //Our.exe file
+            string executableName = "/maya.exe";
+
+            //Our folder names
+            string firstSubFolder = "/maya 3000";
+            string secondSubFolder = "/maya 3001";
+
+            //Make a folder structure to mimic an 'autodesk' type hierarchy
+            string testFolder = Path.GetRandomFileName();
+            var firstPath = Directory.CreateDirectory(testFolder + firstSubFolder);
+            var secondPath = Directory.CreateDirectory(testFolder + secondSubFolder);
+
+            try
+            {
+                //Create any files we need within the folders
+                FileInfo firstExe = new FileInfo(firstPath.FullName + executableName);
+                using (FileStream s = firstExe.Create()) { }
+
+                //Add the paths which will be copied to DCCOptionPaths
+                List<string> testPathList = new List<string>();
+                testPathList.Add(firstPath.FullName + executableName); //this path is valid!
+                testPathList.Add(secondPath.FullName + executableName);
+                testPathList.Add(null);
+                testPathList.Add("cookies/milk/foo/bar");
+
+                //Add the names which will be copied to DCCOptionNames
+                List<string> testNameList = new List<string>();
+                testNameList.Add(firstSubFolder.TrimStart('/'));
+                testNameList.Add(secondSubFolder.TrimStart('/'));
+                testNameList.Add(null);
+                testNameList.Add("Cookies & Milk");
+
+                ExportSettings.instance.SetDCCOptionNames(testNameList);
+                ExportSettings.instance.SetDCCOptionPaths(testPathList);
+
+                GUIContent[] options = ExportSettings.GetDCCOptions();
+
+                //We expect 1, as the others are purposefully bogus
+                Assert.AreEqual(options.Length, 1);
+
+                Assert.IsTrue(options[0].text == "maya 3000");
+            }
+            finally
+            {
+                Directory.Delete(testFolder, true);
+            }
+        }
+
     }
 }

Assets/FbxExporters/Editor/UnitTests/FbxPrefabTest.cs

@@ -425,10 +425,16 @@ public void TestTransformAndReparenting()
             var newCopyPath = ModelExporter.ExportObject(
                 GetRandomFbxFilePath(), root);
             SleepForFileTimestamp();
+
+            var destFile = new FbxPrefabAutoUpdater.FbxPrefabUtility (original.GetComponent<FbxPrefab> ()).GetFbxAssetPath ();
+            if (System.IO.File.Exists (destFile)) {
+                System.IO.File.Delete (destFile);
+            }
+            AssetDatabase.Refresh ();
             System.IO.File.Copy(
                 newCopyPath,
-                new FbxPrefabAutoUpdater.FbxPrefabUtility(original.GetComponent<FbxPrefab>()).GetFbxAssetPath(),
-                overwrite: true);
+                destFile,
+                overwrite: false);
             AssetDatabase.Refresh();
 
             // Make sure the update took.