Merge pull request #286 from Unity-Technologies/Uni-35933-disable-auto-update-branch

Uni 35933 disable auto update branch

Author: benoithudson

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -50,6 +50,12 @@ public override void OnInspectorGUI() {
                 exportSettings.centerObjects
             );
 
+            exportSettings.autoUpdaterEnabled = EditorGUILayout.Toggle(
+                new GUIContent("Auto-Updater:",
+                    "Automatically updates prefabs with new fbx data that was imported."),
+                exportSettings.autoUpdaterEnabled
+            );
+
             GUILayout.BeginHorizontal();
             EditorGUILayout.LabelField(new GUIContent("Export Format:", "Export the FBX file in the standard binary format." +
                 " Select ASCII to export the FBX file in ASCII format."), GUILayout.Width(LabelWidth - FieldOffset));
@@ -424,6 +430,7 @@ public static string[] DCCVendorLocations
         // Note: default values are set in LoadDefaults().
         public bool mayaCompatibleNames = true;
         public bool centerObjects = true;
+        public bool autoUpdaterEnabled = true;
         public bool launchAfterInstallation = true;
         public bool HideSendToUnityMenu = true;
         public int ExportFormatSelection;
@@ -456,6 +463,7 @@ protected override void LoadDefaults()
         {
             mayaCompatibleNames = true;
             centerObjects = true;
+            autoUpdaterEnabled = true;
             launchAfterInstallation = true;
             HideSendToUnityMenu = true;
             ExportFormatSelection = 0;

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

@@ -81,6 +81,12 @@ public static bool MayHaveFbxPrefabToFbxAsset(string prefabPath,
 
         static void OnPostprocessAllAssets(string [] imported, string [] deleted, string [] moved, string [] movedFrom)
         {
+            // Do not start if Auto Updater is disabled in FBX Exporter Settings
+            if (!FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled)
+            {
+                return;
+            }
+
             //Debug.Log("Postprocessing...");
 
             // Did we import an fbx file at all?

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

@@ -149,6 +149,14 @@ public void ReplaceTest ()
 
     public class FbxPrefabAutoUpdaterRemappingTest : ExporterTestBase
     {
+        bool isAutoUpdaterOn;
+        [SetUp]
+        public void Init()
+        {
+            isAutoUpdaterOn = FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled;
+            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = true;
+        }
+
         [Test]
         public void RemappingTest()
         {
@@ -194,6 +202,77 @@ public void RemappingTest()
             Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).name == "SphereFBX");
             Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).GetComponent<MeshFilter>().sharedMesh != null);
         }
+        [TearDown]
+        public void stopTest()
+        {
+            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
+        }
+    }
+
+    public class FbxPrefabAutoUpdaterToggleTest : ExporterTestBase
+    {
+        bool isAutoUpdaterOn;
+        [SetUp]
+        public void Init()
+        {
+            isAutoUpdaterOn = FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled;
+            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = false;
+        }
+
+        [Test]
+        public void RemappingTest()
+        {
+            //Create a hierarchy of objects
+            GameObject cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
+            GameObject sphere = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+            sphere.transform.SetParent(cube.transform);
+            GameObject cylinder = GameObject.CreatePrimitive(PrimitiveType.Cylinder);
+            cylinder.transform.SetParent(sphere.transform);
+
+            string filePath = GetRandomFbxFilePath();
+
+            // Convert to linked prefab instance (auto-updating prefab)
+            GameObject cubePrefabInstance = ConvertToModel.Convert(cube, fbxFullPath: filePath);
+            Object cubePrefabParent = PrefabUtility.GetPrefabParent(cubePrefabInstance);
+
+            // In FbxPrefab Component of Cube, add SphereFBX/Sphere name mapping
+            FbxPrefab fbxPrefabScript = cubePrefabInstance.transform.GetComponent<FbxPrefab>();
+            FbxPrefab.StringPair stringpair = new FbxPrefab.StringPair();
+            stringpair.FBXObjectName = "SphereFBX";
+            stringpair.UnityObjectName = "Sphere";
+            fbxPrefabScript.NameMapping.Add(stringpair);
+            PrefabUtility.ReplacePrefab(cubePrefabInstance, cubePrefabParent);
+
+
+            //Create second FBX
+            GameObject cube2 = GameObject.CreatePrimitive(PrimitiveType.Cube);
+            GameObject sphere2 = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+            // Change name of Sphere to SphereFBX
+            sphere2.transform.name = "SphereFBX";
+            sphere2.transform.SetParent(cube2.transform);
+            GameObject cylinder2 = GameObject.CreatePrimitive(PrimitiveType.Cylinder);
+            cylinder2.transform.SetParent(sphere2.transform);
+
+
+            //export our updated hierarchy to the same file path as the original
+            SleepForFileTimestamp();
+            // "Import" model to Unity (Exporting modified FBX to Unity to see if the remapping works)
+            ExportSelectedObjects(filePath, cube2);
+            AssetDatabase.Refresh();
+
+            // Assert Check Sphere = Sphere and has been changed by the Auto-Updater.
+            Assert.IsTrue(cubePrefabInstance != null);
+            Assert.IsTrue(cubePrefabInstance.GetComponent<MeshFilter>().sharedMesh != null);
+            Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).name == "Sphere");
+            Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).GetComponent<MeshFilter>().sharedMesh != null);
+        }
+
+
+        [TearDown]
+        public void stopTest()
+        {
+            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
+        }
     }
 }