clean up implementation

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -125,6 +125,21 @@ protected override void LoadDefaults()
             mayaCompatibleNames = true;
             centerObjects = true;
             convertToModelSavePath = kDefaultSavePath;
+            turntableScene = null;
+        }
+
+        public static string GetTurnTableSceneName(){
+            if (instance.turntableScene) {
+                return instance.turntableScene.name;
+            }
+            return null;
+        }
+
+        public static string GetTurnTableScenePath(){
+            if (instance.turntableScene) {
+                return AssetDatabase.GetAssetPath (instance.turntableScene);
+            }
+            return null;
         }
 
         /// <summary>

Assets/FbxExporters/Editor/ReviewLastSavedModel.cs

@@ -15,7 +15,9 @@ class TurnTable
         {
             const string MenuItemName = "FbxExporters/Turntable Review/Autoload Last Saved Prefab";
 
-            const string ScenesPath = "Assets";
+            const string DefaultScenesPath = "Assets";
+            const string DefaultSceneName = "FbxExporters_TurnTableReview";
+
             static string SceneName = "FbxExporters_TurnTableReview";
 
             public const string TempSavePath = "_safe_to_delete";
@@ -53,7 +55,7 @@ private static System.IO.FileInfo GetLastSavedFile (string directoryPath, string
 
             private static string GetSceneFilePath ()
             {
-                return System.IO.Path.Combine (ScenesPath, SceneName + ".unity");
+                return System.IO.Path.Combine (DefaultScenesPath, DefaultSceneName + ".unity");
             }
 
             private static string GetLastSavedFilePath ()
@@ -151,42 +153,31 @@ public static void LastSavedModel ()
                 System.Collections.Generic.List<UnityEngine.SceneManagement.Scene> scenes
                       = new System.Collections.Generic.List<UnityEngine.SceneManagement.Scene> ();
 
-                var desiredScene = FbxExporters.EditorTools.ExportSettings.instance.turntableScene;
-                string desiredSceneName = null;
-                if (desiredScene) {
-                    desiredSceneName = desiredScene.name;
+                string desiredSceneName = FbxExporters.EditorTools.ExportSettings.GetTurnTableSceneName ();
+                if (string.IsNullOrEmpty (desiredSceneName)) {
+                    desiredSceneName = DefaultSceneName;
                 }
 
-                bool foundScene = false;
                 for (int i = 0; i < UnityEngine.SceneManagement.SceneManager.sceneCount; i++) {
                     UnityEngine.SceneManagement.Scene toAdd = UnityEngine.SceneManagement.SceneManager.GetSceneAt (i);
 
                     // skip Untitled scene. 
                     // The Untitled scene cannot be unloaded, if modified, and we don't want to force the user to save it.
                     if (toAdd.name == "") continue;
 
-                    if (desiredSceneName != null && toAdd.name == desiredSceneName) {
+                    if (toAdd.name == desiredSceneName) {
                         scene = toAdd;
-                        foundScene = true;
                         continue;
                     }
 
-                    if (!foundScene && toAdd.name == SceneName) 
-                    {
-                        scene = toAdd;
-                        continue;
-                    }
                     scenes.Add (toAdd);
                 }
 
                 // if turntable scene not added to list of scenes
-                if (!scene.IsValid ()) 
+                if (!scene.IsValid () || !scene.isLoaded) 
                 {
-                    string scenePath = null;
-                    if (desiredScene) {
-                        scenePath = UnityEditor.AssetDatabase.GetAssetPath (desiredScene);
-                    } else {
-                        
+                    string scenePath = FbxExporters.EditorTools.ExportSettings.GetTurnTableScenePath ();
+                    if (string.IsNullOrEmpty(scenePath)) {
                         // and if for some reason the turntable scene is missing create an empty scene
                         // NOTE: we cannot use NewScene because it will force me to save the modified Untitled scene
                         if (!System.IO.File.Exists (GetSceneFilePath ())) {