Merge pull request #105 from Unity-Technologies/uni-22029-prefab-redux

Uni 22029 prefab redux

Author: benoithudson

Assets/FbxExporters/Editor/FbxPrefabInspector.cs

@@ -32,14 +32,19 @@ public override void OnInspectorGUI() {
                 fbxPrefab.SetSourceModel(newFbxAsset);
             }
 
+            EditorGUI.EndDisabledGroup();
+
 #if FBXEXPORTER_DEBUG
             GUILayout.BeginHorizontal();
             GUILayout.Label ("Debug info:");
-            EditorGUILayout.SelectableLabel(fbxPrefab.GetFbxHistory().ToJson());
+            try {
+                fbxPrefab.GetFbxHistory().ToJson();
+            } catch(System.Exception xcp) {
+                Debug.LogException(xcp);
+            }
+            EditorGUILayout.SelectableLabel(fbxPrefab.GetFbxHistoryString());
             GUILayout.EndHorizontal();
 #endif
-
-            EditorGUI.EndDisabledGroup();
         }
     }
 }

Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs

@@ -16,6 +16,13 @@ namespace FbxExporters.UnitTests
 {
     public abstract class ExporterTestBase
     {
+        /// <summary>
+        /// Sleep an amount of time (in ms) so we can safely assume that the timestamp on an fbx will change.
+        /// </summary>
+        public void SleepForFileTimestamp() {
+            System.Threading.Thread.Sleep(1000);
+        }
+
         private string _testDirectory;
         protected string filePath {
             get {

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

@@ -74,7 +74,7 @@ public void ReplaceTest ()
             // Export it to the same fbx path. But first, wait one second so
             // that its timestamp differs enough for Unity to notice it
             // changed.
-            System.Threading.Thread.Sleep(1000);
+            SleepForFileTimestamp();
             FbxExporters.Editor.ModelExporter.ExportObject(m_fbxPath, newHierarchy);
             AssetDatabase.Refresh();
 
@@ -103,7 +103,7 @@ public void ExpensivePerformanceTest ()
             var stopwatch = new System.Diagnostics.Stopwatch ();
             stopwatch.Start();
 
-            // Create 1000 fbx models and 1000 prefabs.
+            // Create N fbx models and N/2 prefabs.
             // Each prefab points to an fbx model.
             //
             // Then modify one fbx model. Shouldn't take longer than 1s.