disable anim only UI if include model only

- also clean up the UI for the Options

Author: vkovec

Assets/FbxExporters/Editor/ConvertToPrefabSettings.cs

@@ -51,15 +51,7 @@ public override void OnInspectorGUI ()
             EditorGUI.EndDisabledGroup ();
             GUILayout.EndHorizontal();
 
-            // TODO: add implementation for these options, grey out in the meantime
-            EditorGUI.BeginDisabledGroup (true);
-            GUILayout.BeginHorizontal();
-            EditorGUILayout.LabelField(new GUIContent("Transfer Root Motion To", "Select bone to transfer root motion animation to."), GUILayout.Width(LabelWidth - FieldOffset));
-            EditorGUILayout.Popup(0, new string[]{"<None>"});
-            GUILayout.EndHorizontal();
-
             exportSettings.animatedSkinnedMesh = EditorGUILayout.Toggle ("Animated Skinned Mesh", exportSettings.animatedSkinnedMesh);
-            EditorGUI.EndDisabledGroup ();
 
             exportSettings.mayaCompatibleNaming = EditorGUILayout.Toggle (
                 new GUIContent ("Compatible Naming:",

Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

@@ -371,7 +371,9 @@ protected override bool DisableNameSelection {
             }
             protected override bool DisableTransferAnim {
                 get {
-                    return ToExport == null || ToExport.Length > 1 || IsPlayableDirector;
+                    // don't transfer animation if we are exporting more than one hierarchy, the timeline clips from
+                    // a playable director, or if only the model is being exported
+                    return ToExport == null || ToExport.Length > 1 || IsPlayableDirector || SettingsObject.ModelAnimIncludeOption == ExportSettings.Include.Model;
                 }
             }
 

Assets/FbxExporters/Editor/ExportModelSettings.cs

@@ -67,11 +67,17 @@ public override void OnInspectorGUI ()
             EditorGUI.EndDisabledGroup ();
             GUILayout.EndHorizontal();
 
-            exportSettings.animatedSkinnedMesh = EditorGUILayout.Toggle ("Animated Skinned Mesh", exportSettings.animatedSkinnedMesh);
+            GUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField(new GUIContent("Animated Skinned Mesh",
+                "If checked, animation on objects with skinned meshes will be exported"), GUILayout.Width(LabelWidth - FieldOffset));
+            // greyed out if model
+            EditorGUI.BeginDisabledGroup(exportSettings.include == ExportSettings.Include.Model);
+            exportSettings.animatedSkinnedMesh = EditorGUILayout.Toggle(exportSettings.animatedSkinnedMesh);
             EditorGUI.EndDisabledGroup ();
+            GUILayout.EndHorizontal ();
 
             exportSettings.mayaCompatibleNaming = EditorGUILayout.Toggle (
-                new GUIContent ("Compatible Naming:",
+                new GUIContent ("Compatible Naming",
                     "In Maya some symbols such as spaces and accents get replaced when importing an FBX " +
                     "(e.g. \"foo bar\" becomes \"fooFBXASC032bar\"). " +
                     "On export, convert the names of GameObjects so they are Maya compatible." +
@@ -82,7 +88,7 @@ public override void OnInspectorGUI ()
                 exportSettings.mayaCompatibleNaming);
 
             GUILayout.BeginHorizontal();
-            EditorGUILayout.LabelField(new GUIContent("Export Unrendered:",
+            EditorGUILayout.LabelField(new GUIContent("Export Unrendered",
                 "If checked, meshes will be exported even if they don't have a Renderer component."), GUILayout.Width(LabelWidth - FieldOffset));
             // greyed out if animation only
             EditorGUI.BeginDisabledGroup(exportSettings.include == ExportSettings.Include.Anim);
@@ -121,9 +127,9 @@ public abstract class ExportOptionsSettingsSerializeBase : IExportOptions
         public bool mayaCompatibleNaming = true;
 
         [System.NonSerialized]
-        public Transform animSource;
+        protected Transform animSource;
         [System.NonSerialized]
-        public Transform animDest;
+        protected Transform animDest;
 
         public ExportSettings.ExportFormat ExportFormat { get { return exportFormat; } }
         public void SetExportFormat(ExportSettings.ExportFormat format){ this.exportFormat = format; }