Merge branch 'master' into UNI-41969-restore-include-setting

Author: vkovec

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

@@ -15,13 +15,23 @@ namespace Editor
         public class ConvertToPrefabEditorWindow : ExportOptionsEditorWindow
         {
             protected override GUIContent WindowTitle { get { return new GUIContent ("Convert Options"); }}
-            protected override float MinWindowHeight { get { return 300; } } // determined by trial and error
+            protected override float MinWindowHeight { get { return 350; } } // determined by trial and error
             protected override string ExportButtonName { get { return "Convert"; } }
-            private GameObject[] m_toConvert;
             private string m_prefabFileName = "";
 
             private float m_prefabExtLabelWidth;
 
+            protected override bool DisableNameSelection {
+                get {
+                    return (ToExport != null && ToExport.Length > 1);
+                }
+            }
+            protected override bool DisableTransferAnim {
+                get {
+                    return ToExport == null || ToExport.Length > 1;
+                }
+            }
+
             public static void Init (IEnumerable<GameObject> toConvert)
             {
                 ConvertToPrefabEditorWindow window = CreateWindow<ConvertToPrefabEditorWindow> ();
@@ -31,13 +41,24 @@ public static void Init (IEnumerable<GameObject> toConvert)
             }
 
             protected void SetGameObjectsToConvert(IEnumerable<GameObject> toConvert){
-                m_toConvert = toConvert.OrderBy (go => go.name).ToArray ();
+                ToExport = toConvert.OrderBy (go => go.name).ToArray ();
 
-                if (m_toConvert.Length == 1) {
-                    m_prefabFileName = m_toConvert [0].name;
-                } else if (m_toConvert.Length > 1) {
+                TransferAnimationSource = null;
+                TransferAnimationDest = null;
+
+                if (ToExport.Length == 1) {
+                    m_prefabFileName = ToExport [0].name;
+
+                    // if only one object selected, set transfer source/dest to this object
+                    var go = ModelExporter.GetGameObject (ToExport [0]);
+                    if (go) {
+                        TransferAnimationSource = go.transform;
+                        TransferAnimationDest = go.transform;
+                    }
+                } else if (ToExport.Length > 1) {
                     m_prefabFileName = "(automatic)";
                 }
+
                 this.SetFilename (m_prefabFileName);
             }
 
@@ -63,28 +84,30 @@ protected override void Export ()
                     return;
                 }
 
-                if (m_toConvert == null) {
+                if (ToExport == null) {
                     Debug.LogError ("FbxExporter: missing object for conversion");
                     return;
                 }
 
-                if (m_toConvert.Length == 1) {
+                if (ToExport.Length == 1) {
+                    var go = ModelExporter.GetGameObject (ToExport [0]);
                     ConvertToModel.Convert (
-                        m_toConvert[0], fbxFullPath: fbxPath, prefabFullPath: prefabPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info
+                        go, fbxFullPath: fbxPath, prefabFullPath: prefabPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info
                     );
                     return;
                 }
 
-                foreach (var go in m_toConvert) {
+                foreach (var obj in ToExport) {
+                    var go = ModelExporter.GetGameObject (obj);
                     ConvertToModel.Convert (
                         go, fbxDirectoryFullPath: fbxDirPath, prefabDirectoryFullPath: prefabDirPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info
                     );
                 }
             }
 
-            protected override bool DisableNameSelection ()
+            protected override ExportOptionsSettingsSerializeBase SettingsObject
             {
-                return m_toConvert.Length > 1;
+                get { return ExportSettings.instance.convertToPrefabSettings.info; }
             }
             #if UNITY_2018_1_OR_NEWER
             protected override void ShowPresetReceiver ()
@@ -96,10 +119,10 @@ protected override void CreateCustomUI ()
             {
                 GUILayout.BeginHorizontal ();
                 EditorGUILayout.LabelField(new GUIContent(
-                    "Prefab Name:",
+                    "Prefab Name",
                     "Filename to save prefab to."),GUILayout.Width(LabelWidth-TextFieldAlignOffset));
 
-                EditorGUI.BeginDisabledGroup (DisableNameSelection());
+                EditorGUI.BeginDisabledGroup (DisableNameSelection);
                 // Show the export name with an uneditable ".prefab" at the end
                 //-------------------------------------
                 EditorGUILayout.BeginVertical ();
@@ -121,7 +144,7 @@ protected override void CreateCustomUI ()
 
                 GUILayout.BeginHorizontal();
                 EditorGUILayout.LabelField(new GUIContent(
-                    "Prefab Path:",
+                    "Prefab Path",
                     "Relative path for saving Linked Prefabs."),GUILayout.Width(LabelWidth - FieldOffset));
 
                 var pathLabels = ExportSettings.GetRelativePrefabSavePaths();

Assets/FbxExporters/Editor/ConvertToPrefabSettings.cs

@@ -51,18 +51,10 @@ 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();
-            EditorGUI.EndDisabledGroup ();
-
             exportSettings.animatedSkinnedMesh = EditorGUILayout.Toggle ("Animated Skinned Mesh", exportSettings.animatedSkinnedMesh);
 
             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." +