move transfer anim UI out of options

- can't set it in the preset since it's not serializable, so don't show it with the other options
- if a single object selected, set default source/dest to this object

Author: vkovec

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

@@ -20,6 +20,24 @@ public class ConvertToPrefabEditorWindow : ExportOptionsEditorWindow
 
             private float m_prefabExtLabelWidth;
 
+            protected override Transform TransferAnimationSource {
+                get {
+                    return ExportSettings.instance.convertToPrefabSettings.info.AnimationSource;
+                }
+                set {
+                    ExportSettings.instance.convertToPrefabSettings.info.SetAnimationSource (value);
+                }
+            }
+
+            protected override Transform TransferAnimationDest {
+                get {
+                    return ExportSettings.instance.convertToPrefabSettings.info.AnimationDest;
+                }
+                set {
+                    ExportSettings.instance.convertToPrefabSettings.info.SetAnimationDest (value);
+                }
+            }
+
             public static void Init (IEnumerable<GameObject> toConvert)
             {
                 ConvertToPrefabEditorWindow window = CreateWindow<ConvertToPrefabEditorWindow> ();
@@ -33,6 +51,13 @@ protected void SetGameObjectsToConvert(IEnumerable<GameObject> toConvert){
 
                 if (m_toConvert.Length == 1) {
                     m_prefabFileName = m_toConvert [0].name;
+
+                    // if only one object selected, set transfer source/dest to this object
+                    var go = ModelExporter.GetGameObject (m_toConvert [0]);
+                    if (go) {
+                        TransferAnimationSource = go.transform;
+                        TransferAnimationDest = go.transform;
+                    }
                 } else if (m_toConvert.Length > 1) {
                     m_prefabFileName = "(automatic)";
                 }

Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

@@ -118,6 +118,9 @@ protected void ShowPresetReceiver(UnityEngine.Object target){
                 UnityEditor.Presets.PresetSelector.ShowSelector(target, null, true, m_receiver);
             }
 
+            protected abstract Transform TransferAnimationSource { get; set; }
+            protected abstract Transform TransferAnimationDest { get; set; }
+
             protected void OnGUI ()
             {
                 // Increasing the label width so that none of the text gets cut off
@@ -198,6 +201,15 @@ protected void OnGUI ()
 
                 CreateCustomUI();
 
+                EditorGUILayout.Space ();
+                EditorGUI.indentLevel--;
+                GUILayout.BeginHorizontal();
+                EditorGUILayout.LabelField(new GUIContent("Transfer Animation", "Select bone to transfer root motion animation to."), GUILayout.Width(LabelWidth - FieldOffset));
+                GUILayout.EndHorizontal();
+                EditorGUI.indentLevel++;
+                TransferAnimationSource = EditorGUILayout.ObjectField ("Source", TransferAnimationSource, typeof(Transform), allowSceneObjects: true) as Transform;
+                TransferAnimationDest = EditorGUILayout.ObjectField ("Destination", TransferAnimationDest, typeof(Transform), allowSceneObjects: true) as Transform;
+
                 EditorGUILayout.Space ();
                 EditorGUI.indentLevel--;
                 m_showOptions = EditorGUILayout.Foldout (m_showOptions, "Options");
@@ -257,6 +269,24 @@ public class ExportModelEditorWindow : ExportOptionsEditorWindow
             private bool m_singleHierarchyExport = true;
             private bool m_isPlayableDirector = false;
 
+            protected override Transform TransferAnimationSource {
+                get {
+                    return ExportSettings.instance.exportModelSettings.info.AnimationSource;
+                }
+                set {
+                    ExportSettings.instance.exportModelSettings.info.SetAnimationSource (value);
+                }
+            }
+
+            protected override Transform TransferAnimationDest {
+                get {
+                    return ExportSettings.instance.exportModelSettings.info.AnimationDest;
+                }
+                set {
+                    ExportSettings.instance.exportModelSettings.info.SetAnimationDest (value);
+                }
+            }
+
             public static void Init (IEnumerable<UnityEngine.Object> toExport, string filename = "", bool isTimelineAnim = false, bool isPlayableDirector = false)
             {
                 ExportModelEditorWindow window = CreateWindow<ExportModelEditorWindow> ();
@@ -273,6 +303,16 @@ public static void Init (IEnumerable<UnityEngine.Object> toExport, string filena
 
             protected int SetGameObjectsToExport(IEnumerable<UnityEngine.Object> toExport){
                 m_toExport = toExport.ToArray ();
+
+                // if only one object selected, set transfer source/dest to this object
+                if (m_toExport.Length == 1) {
+                    var go = ModelExporter.GetGameObject (m_toExport [0]);
+                    if (go) {
+                        TransferAnimationSource = go.transform;
+                        TransferAnimationDest = go.transform;
+                    }
+                }
+
                 return m_toExport.Length;
             }
 

Assets/FbxExporters/Editor/ExportModelSettings.cs

@@ -67,14 +67,6 @@ public override void OnInspectorGUI ()
             EditorGUI.EndDisabledGroup ();
             GUILayout.EndHorizontal();
 
-            GUILayout.BeginHorizontal();
-            EditorGUILayout.LabelField(new GUIContent("Transfer Animation", "Select bone to transfer root motion animation to."), GUILayout.Width(LabelWidth - FieldOffset));
-            GUILayout.EndHorizontal();
-            EditorGUI.indentLevel++;
-            exportSettings.animSource = EditorGUILayout.ObjectField ("Source", exportSettings.animSource, typeof(Transform), allowSceneObjects: true) as Transform;
-            exportSettings.animDest = EditorGUILayout.ObjectField ("Destination", exportSettings.animDest, typeof(Transform), allowSceneObjects: true) as Transform;
-            EditorGUI.indentLevel--;
-
             exportSettings.animatedSkinnedMesh = EditorGUILayout.Toggle ("Animated Skinned Mesh", exportSettings.animatedSkinnedMesh);
             EditorGUI.EndDisabledGroup ();
 
@@ -140,7 +132,9 @@ public abstract class ExportOptionsSettingsSerializeBase : IExportOptions
         public bool UseMayaCompatibleNames { get { return mayaCompatibleNaming; } }
         public void SetUseMayaCompatibleNames(bool useMayaCompNames){ this.mayaCompatibleNaming = useMayaCompNames; }
         public Transform AnimationSource { get { return animSource; } }
+        public void SetAnimationSource(Transform source) { this.animSource = source; }
         public Transform AnimationDest { get { return animDest; } }
+        public void SetAnimationDest(Transform dest) { this.animDest = dest; }
         public abstract ExportSettings.Include ModelAnimIncludeOption { get; }
         public abstract ExportSettings.LODExportType LODExportType { get; }
         public abstract ExportSettings.ObjectPosition ObjectPosition { get; }

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -64,9 +64,6 @@ namespace Editor
 
         public class ModelExporter : System.IDisposable
         {
-            // To be replaced by checkbox in Fbx Export settings
-            bool removeAnimationsFromSkinnedMeshRenderer = true;
-
             const string Title =
                 "exports static meshes with materials and textures";
 
@@ -1821,7 +1818,7 @@ protected void ExportAnimationClip (AnimationClip uniAnimClip, GameObject uniRoo
                 // transfer root motion
                 var animSource = ExportOptions.AnimationSource;
                 var animDest = ExportOptions.AnimationDest;
-                if (animSource && animDest) {
+                if (animSource && animDest && animSource != animDest) {
                     // list of all transforms between source and dest, including source and dest
                     var transformsFromSourceToDest = new List<Transform> ();
                     var curr = animDest;
@@ -2307,7 +2304,7 @@ private bool TransformShouldBeReset(Transform t){
                 var source = ExportOptions.AnimationSource;
                 var dest = ExportOptions.AnimationDest;
 
-                if (!source || !dest) {
+                if (!source || !dest || source == dest) {
                     return false;
                 }