Merge pull request #166 from Unity-Technologies/UNI-26822-move-editor-fbxprefab-to-autoupdater

UNI-26822 move editor only code in FbxPrefab to FbxAutoUpdater

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -199,7 +199,8 @@ public static GameObject Convert (
                     Object.DestroyImmediate(fbxPrefab);
                 }
                 fbxPrefab = unityGO.AddComponent<FbxPrefab>();
-                fbxPrefab.SetSourceModel(unityMainAsset);
+                var fbxPrefabUtility = new FbxPrefabAutoUpdater.FbxPrefabUtility (fbxPrefab);
+                fbxPrefabUtility.SetSourceModel(unityMainAsset);
 
                 // Disconnect from the FBX file.
                 PrefabUtility.DisconnectPrefabInstance(unityGO);

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

@@ -16,13 +16,14 @@ public override void OnInspectorGUI() {
             }
             EditorGUI.BeginDisabledGroup(isDisabled);
 
-            var oldFbxAsset = fbxPrefab.GetFbxAsset();
+            var fbxPrefabUtility = new FbxPrefabAutoUpdater.FbxPrefabUtility (fbxPrefab);
+            var oldFbxAsset = fbxPrefabUtility.GetFbxAsset();
             var newFbxAsset = EditorGUILayout.ObjectField("Source Fbx Asset", oldFbxAsset,
                     typeof(GameObject), allowSceneObjects: false) as GameObject;
             if (newFbxAsset && !AssetDatabase.GetAssetPath(newFbxAsset).EndsWith(".fbx")) {
                 Debug.LogError("FbxPrefab must point to an Fbx asset (or none).");
             } else if (newFbxAsset != oldFbxAsset) {
-                fbxPrefab.SetSourceModel(newFbxAsset);
+                fbxPrefabUtility.SetSourceModel(newFbxAsset);
             }
 
             EditorGUI.EndDisabledGroup();

Assets/FbxExporters/Editor/FbxPrefabInspector.cs

@@ -34,7 +34,7 @@ public void Init ()
             // Instantiate the fbx and create a prefab from it.
             // Delete the object right away (don't even wait for term).
             var fbxInstance = PrefabUtility.InstantiatePrefab(m_fbx) as GameObject;
-            fbxInstance.AddComponent<FbxPrefab>().SetSourceModel(m_fbx);
+            new FbxPrefabAutoUpdater.FbxPrefabUtility(fbxInstance.AddComponent<FbxPrefab>()).SetSourceModel(m_fbx);
             m_prefabPath = GetRandomPrefabAssetPath();
             m_prefab = PrefabUtility.CreatePrefab(m_prefabPath, fbxInstance);
             AssetDatabase.Refresh ();
@@ -47,7 +47,7 @@ public void BasicTest ()
         {
             var fbxPrefabPath = FbxPrefabAutoUpdater.FindFbxPrefabAssetPath();
             Assert.IsFalse(string.IsNullOrEmpty(fbxPrefabPath));
-            Assert.IsTrue(fbxPrefabPath.EndsWith("FbxPrefab.cs"));
+            Assert.IsTrue(fbxPrefabPath.EndsWith(FbxPrefabAutoUpdater.FBX_PREFAB_FILE));
 
             Assert.IsTrue(FbxPrefabAutoUpdater.IsFbxAsset("Assets/path/to/foo.fbx"));
             Assert.IsFalse(FbxPrefabAutoUpdater.IsFbxAsset("Assets/path/to/foo.png"));
@@ -145,7 +145,7 @@ public void ExpensivePerformanceTest ()
                 var instance = CreateGameObject("prefab_" + i);
                 Assert.IsTrue(instance);
                 var fbxPrefab = instance.AddComponent<FbxPrefab>();
-                fbxPrefab.SetSourceModel(fbxFiles[i]);
+                new FbxPrefabAutoUpdater.FbxPrefabUtility(fbxPrefab).SetSourceModel(fbxFiles[i]);
                 PrefabUtility.CreatePrefab(GetRandomPrefabAssetPath(), fbxFiles[i]);
             }
             Debug.Log("Created prefabs in " + stopwatch.ElapsedMilliseconds);