move export unrendered out of export settings singleton

Author: vkovec

Assets/FbxExporters/Editor/ConvertToPrefabSettings.cs

@@ -105,6 +105,9 @@ public bool AnimateSkinnedMesh(){
         public bool UseMayaCompatibleNames(){
             return info.mayaCompatibleNaming;
         }
+        public bool ExportUnrendered(){
+            return true;
+        }
     }
 
     [System.Serializable]

Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

@@ -272,6 +272,7 @@ protected bool OverwriteExistingFile(string filePath){
 
         public class ExportModelEditorWindow : ExportOptionsEditorWindow
         {
+            protected override float MinWindowHeight { get { return 260; } }
             private UnityEngine.Object[] m_toExport;
 
             public static void Init (IEnumerable<UnityEngine.Object> toExport, string filename = "", ModelExporter.AnimationExportType exportType = ModelExporter.AnimationExportType.all)

Assets/FbxExporters/Editor/ExportModelSettings.cs

@@ -79,6 +79,12 @@ public override void OnInspectorGUI ()
                         " and unexpected character replacements in Maya.")
                 ),
                 exportSettings.mayaCompatibleNaming);
+
+            exportSettings.exportUnrendered = EditorGUILayout.Toggle(
+                new GUIContent("Export Unrendered:",
+                    "If checked, meshes will be exported even if they don't have a Renderer component."),
+                exportSettings.exportUnrendered
+            );
         }
     }
 
@@ -90,6 +96,7 @@ public interface IExportOptions {
         void SetObjectPosition(ExportModelSettingsSerialize.ObjectPosition objPos);
         bool AnimateSkinnedMesh();
         bool UseMayaCompatibleNames();
+        bool ExportUnrendered();
     }
 
     public class ExportModelSettings : ScriptableObject, IExportOptions
@@ -125,6 +132,9 @@ public bool AnimateSkinnedMesh(){
         public bool UseMayaCompatibleNames(){
             return info.mayaCompatibleNaming;
         }
+        public bool ExportUnrendered(){
+            return info.exportUnrendered;
+        }
     }
 
     [System.Serializable]
@@ -145,5 +155,6 @@ public enum LODExportType { All = 0, Highest = 1, Lowest = 2 }
         public string rootMotionTransfer = "";
         public bool animatedSkinnedMesh = true;
         public bool mayaCompatibleNaming = true;
+        public bool exportUnrendered = true;
     }
 }

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -38,12 +38,6 @@ public override void OnInspectorGUI() {
                     "Automatically updates prefabs with new fbx data that was imported."),
                 exportSettings.autoUpdaterEnabled
             );
-
-            exportSettings.exportMeshNoRenderer = EditorGUILayout.Toggle(
-                new GUIContent("Export Unrendered:",
-                    "If checked, meshes will be exported even if they don't have a Renderer component."),
-                exportSettings.exportMeshNoRenderer
-            );
             EditorGUILayout.Space();
             EditorGUILayout.Space();
             EditorGUI.indentLevel--;
@@ -367,7 +361,6 @@ public static string[] DCCVendorLocations
         public bool launchAfterInstallation = true;
         public bool HideSendToUnityMenu = true;
         public bool BakeAnimation = true;
-        public bool exportMeshNoRenderer = false;
 
         public string IntegrationSavePath;
 
@@ -418,40 +411,6 @@ public static string[] DCCVendorLocations
         [SerializeField]
         private ConvertToPrefabSettingsSerialize convertToPrefabSettingsSerialize;
 
-        // ---------------- get functions for options in ExportModelSettings ----------------
-        /*public static ExportModelSettingsSerialize.ExportFormat GetExportFormat(){
-            return instance.exportModelSettings.info.exportFormat;
-        }
-
-        public static ExportModelSettingsSerialize.Include GetModelAnimIncludeOption(){
-            return instance.exportModelSettings.info.include;
-        }
-
-        public static ExportModelSettingsSerialize.LODExportType GetLODExportType(){
-            return instance.exportModelSettings.info.lodLevel;
-        }
-
-        public static ExportModelSettingsSerialize.ObjectPosition GetObjectPosition(){
-            return instance.exportModelSettings.info.objectPosition;
-        }
-
-        public static void SetObjectPosition(ExportModelSettingsSerialize.ObjectPosition objPos){
-            instance.exportModelSettings.info.objectPosition = objPos;
-        }
-
-        public static string GetRootMotionTransferNode(){
-            return instance.exportModelSettings.info.rootMotionTransfer;
-        }
-
-        public static bool AnimateSkinnedMesh(){
-            return instance.exportModelSettings.info.animatedSkinnedMesh;
-        }
-
-        public static bool UseMayaCompatibleNames(){
-            return instance.exportModelSettings.info.mayaCompatibleNaming;
-        }*/
-        // ---------------------------------------------------------------------------------
-
         protected override void LoadDefaults()
         {
             autoUpdaterEnabled = true;

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -3536,7 +3536,7 @@ bool ExportMesh (GameObject gameObject, FbxNode fbxNode)
 
                 // if user doesn't want to export mesh colliders, and this gameobject doesn't have a renderer
                 // then don't export it.
-                if (!ExportSettings.instance.exportMeshNoRenderer && !gameObject.GetComponent<Renderer>()) {
+                if (!ExportOptions.ExportUnrendered() && !gameObject.GetComponent<Renderer>()) {
                     return false;
                 }