Pull Request changes

Author: MarcShakour

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?
@@ -182,7 +188,7 @@ public string GetUnityObjectName(string fbxObjectName)
             public string GetFBXObjectName(string unityObjectName)
             {
                 string oldNameInFBX = unityObjectName;
-                if (unityObjectName != "" && m_fbxPrefab.NameMapping != null) {
+                if (String.IsNullOrEmpty(unityObjectName) && m_fbxPrefab.NameMapping != null) {
                     foreach (var nameMapping in m_fbxPrefab.NameMapping) {
                         if (unityObjectName == nameMapping.UnityObjectName) {
                             oldNameInFBX = nameMapping.FBXObjectName;
@@ -455,7 +461,6 @@ void InitFromJson(string json, ref int index)
                             string name = ReadString(json, ref index);
                             Consume(':', json, ref index);
 
-
                             // hack: If the name starts with a '-' it's the name
                             // of a gameobject, and we parse it recursively. Otherwise
                             // it's the name of a component, and we store its value as a string.
@@ -1036,7 +1041,7 @@ public HashSet<GameObject> ImplementUpdates(FbxPrefab prefabInstance)
                         foreach(var componentType in typesToDestroy) {
                             var component = prefabXfo.GetComponent(componentType);
                             if (component != null) {
-                                Object.DestroyImmediate(component);
+                                GameObject.DestroyImmediate(component);
                                 Log("destroyed component {0}:{1}", nodeName, componentType);
                             }
                         }

Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs

@@ -235,18 +235,16 @@ protected virtual GameObject ExportSelection(params Object[] selected)
 
         protected virtual string ExportSelectedObjects(string filename, params Object[] selected)
         {
-            var fbxFileName = FbxExporters.Editor.ModelExporter.ExportObjects(filename, selected) as string;
+            string fbxFileName = FbxExporters.Editor.ModelExporter.ExportObjects(filename, selected);
 
             return fbxFileName;
         }
 
-
-
-            /// <summary>
-            /// Compares two hierarchies, asserts that they match precisely.
-            /// The root can be allowed to mismatch. That's normal with
-            /// GameObject.Instantiate.
-            /// </summary>
+        /// <summary>
+        /// Compares two hierarchies, asserts that they match precisely.
+        /// The root can be allowed to mismatch. That's normal with
+        /// GameObject.Instantiate.
+        /// </summary>
         public static void AssertSameHierarchy (
             GameObject expectedHierarchy, GameObject actualHierarchy,
             bool ignoreRootName = false, bool ignoreRootTransform = false)

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

@@ -159,8 +159,10 @@ public void RemappingTest()
             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);
+            GameObject cubePrefabInstance = ConvertToModel.Convert(cube, fbxFullPath: filePath);
             Object cubePrefabParent = PrefabUtility.GetPrefabParent(cubePrefabInstance);
 
             // In FbxPrefab Component of Cube, add SphereFBX/Sphere name mapping
@@ -184,18 +186,14 @@ public void RemappingTest()
             //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)
-            string fbxFileName = ExportSelectedObjects(Application.dataPath + "/Cube.fbx", cube2);
+            string fbxFileName = ExportSelectedObjects(filePath, cube2);
             AssetDatabase.Refresh();
 
             // Assert Check Sphere = SphereFBX
             Assert.IsTrue(cubePrefabInstance != null);
             Assert.IsTrue(cubePrefabInstance.GetComponent<MeshFilter>().sharedMesh != null);
             Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).name == "SphereFBX");
             Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).GetComponent<MeshFilter>().sharedMesh != null);
-
-            // Destroy the objects 
-            GameObject.DestroyImmediate(cubePrefabInstance);
-            //GameObject.DestroyImmediate(cube2);
         }
     }
 }