Updated with changes asked in pull request

Author: MarcShakour

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

@@ -26,13 +26,13 @@ namespace FbxExporters
     /// </summary>
     public /*static*/ class FbxPrefabAutoUpdater : UnityEditor.AssetPostprocessor
     {
-#if UNITY_EDITOR
+        #if UNITY_EDITOR
         public const string FBX_PREFAB_FILE = "/FbxPrefab.cs";
-#else
+        #else
         public const string FBX_PREFAB_FILE = "/UnityFbxPrefab.dll";
-#endif
+        #endif
 
-        static string[] importedAssets;
+        const string MenuItemName = "GameObject/Update from Fbx";
 
         public static string FindFbxPrefabAssetPath()
         {
@@ -57,8 +57,6 @@ public static bool IsPrefabAsset(string assetPath) {
             return assetPath.EndsWith(".prefab");
         }
 
-        const string MenuItemName = "GameObject/Update from Fbx";
-
         /// <summary>
         /// Return false if the prefab definitely does not have an
         /// FbxPrefab component that points to one of the Fbx assets
@@ -192,45 +190,47 @@ static void OnContextItem(MenuCommand command)
                 return;
             }
 
-            //Selection.objects = UpdateLinkedPrefab(selection);
-            UpdateLinkedPrefab(selection);
+            foreach (GameObject selectedObject in selection)
+            {
+                UpdateLinkedPrefab(selectedObject);
+            }
         }
 
         /// <summary>
         // Validate the menu item defined by the function above.
         /// </summary>
         [MenuItem(MenuItemName, true,31)]
-        static bool OnValidateMenuItem()
+        public static bool OnValidateMenuItem()
         {
             GameObject[] selection = Selection.GetFiltered<GameObject>(SelectionMode.Editable | SelectionMode.TopLevel);
-            bool allObjectsPrefab = false;
             foreach (GameObject selectedObject in selection)
             {
-                if (selectedObject.GetComponentInChildren<FbxPrefab>())
+                GameObject prefab = UnityEditor.PrefabUtility.GetPrefabParent(selectedObject) as GameObject;
+                if (!prefab)
+                {
+                    return false;
+                }
+                if (prefab.GetComponentInChildren<FbxPrefab>())
                 {
-                    allObjectsPrefab = true;
-                    break;
+                    return true;
                 }
             }
 
-            var isPrefab = PrefabUtility.GetPrefabParent(Selection.activeGameObject) != null;
-            return isPrefab && allObjectsPrefab;
+            return false;
         }
 
-        public static void UpdateLinkedPrefab(GameObject[] selection)
+        public static void UpdateLinkedPrefab(GameObject prefabInstance)
         {
-            var fbxPrefabScriptPath = FindFbxPrefabAssetPath();
-            foreach (GameObject selectedObject in selection)
+            GameObject prefab = UnityEditor.PrefabUtility.GetPrefabParent(prefabInstance) as GameObject;
+            if (!prefab)
             {
-                GameObject prefabInstance = selectedObject;
-
-                GameObject prefab = UnityEditor.PrefabUtility.GetPrefabParent(prefabInstance) as GameObject;
+                return;
+            }
 
-                foreach (var fbxPrefabComponent in prefab.GetComponentsInChildren<FbxPrefab>())
-                {
-                    var fbxPrefabUtility = new FbxPrefabUtility(fbxPrefabComponent);
-                    fbxPrefabUtility.SyncPrefab();
-                }
+            foreach (var fbxPrefabComponent in prefab.GetComponentsInChildren<FbxPrefab>())
+            {
+                var fbxPrefabUtility = new FbxPrefabUtility(fbxPrefabComponent);
+                fbxPrefabUtility.SyncPrefab();
             }
         }
 

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

@@ -266,15 +266,43 @@ public void RemappingTest()
             Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).name == "Sphere");
             Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).GetComponent<MeshFilter>().sharedMesh != null);
 
-            // Testing Manual update
+            // Testing Manual update on true prefab
             GameObject[] selection = new GameObject[] { cubePrefabInstance };
-            FbxPrefabAutoUpdater.UpdateLinkedPrefab(selection);
-
+            FbxPrefabAutoUpdater.UpdateLinkedPrefab(selection[0]);
             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);
 
+            // Testing Manual update on some random object that isn't a prefab at all
+            GameObject quad = GameObject.CreatePrimitive(PrimitiveType.Quad);
+            FbxPrefabAutoUpdater.UpdateLinkedPrefab(quad);
+            Assert.IsTrue(quad != null);
+            Assert.IsTrue(quad.GetComponent<MeshFilter>().sharedMesh != null);
+
+            // Testing Manual update on some random prefab that doesn't have an FbxPrefab in it.
+            GameObject capsule = GameObject.CreatePrimitive(PrimitiveType.Capsule);
+            // Convert to linked prefab instance (auto-updating prefab)
+            string prefabPath = GetRandomPrefabAssetPath();
+            GameObject capsuleInstance = PrefabUtility.CreatePrefab(prefabPath, capsule);
+            FbxPrefabAutoUpdater.UpdateLinkedPrefab(capsuleInstance);
+            Assert.IsTrue(capsuleInstance != null);
+            Assert.IsTrue(capsuleInstance.GetComponent<MeshFilter>().sharedMesh != null);
+
+            // Check the menu returns true because sphere3 is a linked prefab
+            GameObject cylinder3 = GameObject.CreatePrimitive(PrimitiveType.Cylinder);
+            GameObject sphere3 = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+            sphere3.transform.SetParent(cylinder3.transform);
+            GameObject sphere3Instance = ConvertToModel.Convert(sphere3, fbxFullPath: filePath);
+            Selection.objects = new GameObject[] { sphere3Instance };
+            Assert.IsTrue(FbxPrefabAutoUpdater.OnValidateMenuItem());
+
+            // Check the contextual menu returns false because there is no linked prefab
+            GameObject cylinder4 = GameObject.CreatePrimitive(PrimitiveType.Cylinder);
+            GameObject sphere4 = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+            sphere4.transform.SetParent(cylinder4.transform);
+            Selection.objects = new GameObject[] { cylinder4, sphere4 };
+            Assert.IsFalse(FbxPrefabAutoUpdater.OnValidateMenuItem());
         }