Merge pull request #14 from Unity-Technologies/Uni-20890-fbxexport-settings-fail-to-get

Uni-20890 return new ExportSettings when we fail to get

Author: inwoods

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -47,7 +47,7 @@ public static T instance
             {
                 if (ScriptableSingleton<T>.s_Instance == null)
                 {
-                    ScriptableSingleton<T>.CreateAndLoad();
+                    return ScriptableSingleton<T>.CreateAndLoad();
                 }
                 return ScriptableSingleton<T>.s_Instance;
             }
@@ -60,22 +60,23 @@ protected ScriptableSingleton()
                 Debug.LogError("ScriptableSingleton already exists. Did you query the singleton in a constructor?");
             }
         }
-        private static void CreateAndLoad()
+        private static T CreateAndLoad()
         {
             string filePath = ScriptableSingleton<T>.GetFilePath();
             if (!string.IsNullOrEmpty(filePath))
             {
                 var loaded = InternalEditorUtility.LoadSerializedFileAndForget(filePath);
+
                 if (loaded.Length > 0) {
                     ScriptableSingleton<T>.s_Instance = loaded [0] as T;
-                    return;
                 }
             }
             if (ScriptableSingleton<T>.s_Instance == null)
             {
                 T t = ScriptableObject.CreateInstance<T>();
                 ScriptableSingleton<T>.s_Instance = t;
             }
+            return ScriptableSingleton<T>.s_Instance;
         }
         protected virtual void Save(bool saveAsText)
         {