Merge branch 'UNI-40575-transfer-root-motion' of https://github.com/Unity-Technologies/FbxExporters into UNI-40575-transfer-root-motion

Author: inwoods

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

@@ -3,7 +3,9 @@
 using UnityEngine;
 using UnityEditor;
 using FbxExporters.EditorTools;
+#if UNITY_2018_1_OR_NEWER
 using UnityEditor.Presets;
+#endif
 using System.Linq;
 
 namespace FbxExporters
@@ -107,12 +109,12 @@ protected override ExportOptionsSettingsSerializeBase SettingsObject
             {
                 get { return ExportSettings.instance.convertToPrefabSettings.info; }
             }
-
+            #if UNITY_2018_1_OR_NEWER
             protected override void ShowPresetReceiver ()
             {
                 ShowPresetReceiver (ExportSettings.instance.convertToPrefabSettings);
             }
-
+            #endif
             protected override void CreateCustomUI ()
             {
                 GUILayout.BeginHorizontal ();

Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

@@ -3,7 +3,9 @@
 using UnityEngine;
 using UnityEditor;
 using FbxExporters.EditorTools;
+#if UNITY_2018_1_OR_NEWER
 using UnityEditor.Presets;
+#endif
 using System.Linq;
 
 namespace FbxExporters
@@ -20,7 +22,7 @@ public abstract class ExportOptionsEditorWindow : EditorWindow
             protected const float TextFieldAlignOffset = 3;
             protected const float ExportButtonWidth = 100;
             protected const float FbxExtOffset = -7;
-            protected virtual float MinWindowHeight { get { return 250; } }
+            protected virtual float MinWindowHeight { get { return 300; } }
 
             protected virtual string ExportButtonName { get { return "Export"; } }
 
@@ -29,8 +31,9 @@ public abstract class ExportOptionsEditorWindow : EditorWindow
             protected string m_exportFileName = "";
 
             protected UnityEditor.Editor m_innerEditor;
+            #if UNITY_2018_1_OR_NEWER
             protected FbxExportPresetSelectorReceiver m_receiver;
-
+            #endif
             private static GUIContent presetIcon { get { return EditorGUIUtility.IconContent ("Preset.Context"); }}
             private static GUIStyle presetIconButton { get { return new GUIStyle("IconButton"); }}
 
@@ -52,7 +55,9 @@ protected UnityEngine.Object[] ToExport {
             }
 
             protected virtual void OnEnable(){
+                #if UNITY_2018_1_OR_NEWER
                 InitializeReceiver ();
+                #endif
                 m_showOptions = true;
                 this.minSize = new Vector2 (SelectableLabelMinWidth + LabelWidth + BrowseButtonWidth, MinWindowHeight);
 
@@ -77,6 +82,7 @@ protected virtual void InitializeWindow(string filename = ""){
                 this.SetFilename (filename);
             }
 
+            #if UNITY_2018_1_OR_NEWER
             protected void InitializeReceiver(){
                 if (!m_receiver) {
                     m_receiver = ScriptableObject.CreateInstance<FbxExportPresetSelectorReceiver> () as FbxExportPresetSelectorReceiver;
@@ -86,6 +92,7 @@ protected void InitializeReceiver(){
                     m_receiver.DialogClosed += SaveExportSettings;
                 }
             }
+            #endif
 
             public void SetFilename(string filename){
                 // remove .fbx from end of filename
@@ -116,6 +123,7 @@ public void OnPresetSelectionChanged()
             /// </summary>
             protected virtual void CreateCustomUI(){}
 
+            #if UNITY_2018_1_OR_NEWER  
             protected abstract void ShowPresetReceiver ();
 
             protected void ShowPresetReceiver(UnityEngine.Object target){
@@ -124,6 +132,7 @@ protected void ShowPresetReceiver(UnityEngine.Object target){
                 m_receiver.SetInitialValue (new Preset (target));
                 UnityEditor.Presets.PresetSelector.ShowSelector(target, null, true, m_receiver);
             }
+            #endif
 
             protected Transform TransferAnimationSource {
                 get {
@@ -238,9 +247,13 @@ protected void OnGUI ()
 
                 GUILayout.BeginHorizontal ();
                 GUILayout.FlexibleSpace ();
+                
+                #if UNITY_2018_1_OR_NEWER  
                 if(EditorGUILayout.DropdownButton(presetIcon, FocusType.Keyboard, presetIconButton)){
                     ShowPresetReceiver ();
                 }
+                #endif
+
                 GUILayout.EndHorizontal();
 
                 EditorGUILayout.LabelField("Naming");
@@ -523,10 +536,12 @@ protected override void Export(){
                 }
             }
 
+            #if UNITY_2018_1_OR_NEWER  
             protected override void ShowPresetReceiver ()
             {
                 ShowPresetReceiver (ExportSettings.instance.exportModelSettings);
             }
+            #endif
         }
     }
 }

Assets/FbxExporters/Editor/FbxExportPresetSelectorReceiver.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+#if UNITY_2018_1_OR_NEWER
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor.Presets;
@@ -45,4 +46,5 @@ public void SetTarget(UnityEngine.Object target){
     public void SetInitialValue(Preset initialValue){
         m_InitialValue = initialValue;
     }
-}
+}
+#endif

Assets/FbxExporters/Editor/FbxExportPresetSelectorReceiver.cs.meta

@@ -81,7 +81,7 @@ public class ModelExporter : System.IDisposable
             // NOTE: The ellipsis at the end of the Menu Item name prevents the context
             //       from being passed to command, thus resulting in OnContextItem()
             //       being called only once regardless of what is selected.
-            const string MenuItemName = "GameObject/Export Model...";
+            const string MenuItemName = "GameObject/Export To FBX...";
             const string ModelOnlyMenuItemName = "GameObject/Export Model Only...";
 
             const string ClipMenuItemName = "GameObject/Export All Recorded Animation Clips...";
@@ -1804,7 +1804,8 @@ protected void ExportAnimationClip (AnimationClip uniAnimClip, GameObject uniRoo
                     }
 
                     var uniGO = GetGameObject (uniObj);
-                    if (!uniGO) {
+                    // Check if the GameObject has an FBX node to the animation. It might be null because the LOD selected doesn't match the one on the gameobject. 
+                    if (!uniGO || MapUnityObjectToFbxNode.ContainsKey(uniGO) == false) {
                         continue;
                     }
 
@@ -3342,41 +3343,6 @@ public static void ExportSingleTimelineClip(TimelineClip timelineClipSelected, G
                 ExportModelEditorWindow.Init (exportArray, string.Format (AnimFbxFormat, animationTrackGObject.name, timelineClipSelected.displayName), isTimelineAnim: true);
             }
 
-            /// <summary>
-            /// Add an option " GameObject/Export All Recorded Animation Clips..." in the contextual GameObject menu.
-            /// </summary>
-            [MenuItem(ClipMenuItemName, false, 31)]
-            public static void OnPlayableDirectorGameObjectContextClick(MenuCommand command)
-            {
-                Object[] selection = null;
-
-                if (command == null || command.context == null)
-                {
-                    // We were actually invoked from the top GameObject menu, so use the selection.
-                    selection = Selection.GetFiltered<Object>(SelectionMode.Editable | SelectionMode.TopLevel);
-                }
-                else
-                {
-                    // We were invoked from the right-click menu, so use the context of the context menu.
-                    GameObject selected = command.context as GameObject;
-                    if (selected)
-                    {
-                        selection = new GameObject[] { selected };
-                    }
-                }
-
-                var playableDirectors = new List<UnityEngine.Object> ();
-                foreach (GameObject objectWithPlayableDirector in selection)
-                {
-                    PlayableDirector pd = objectWithPlayableDirector.GetComponent<PlayableDirector>();
-                    if (pd == null) {
-                        continue;
-                    }
-                    playableDirectors.Add (objectWithPlayableDirector);
-                }
-                ExportModelEditorWindow.Init (playableDirectors, "(automatic)", isTimelineAnim:true, isPlayableDirector:true);
-            }
-
             public static void ExportAllTimelineClips(GameObject objectWithPlayableDirector, string folderPath, IExportOptions exportOptions = null)
             {
                 PlayableDirector pd = objectWithPlayableDirector.GetComponent<PlayableDirector>();
@@ -3402,31 +3368,6 @@ public static void ExportAllTimelineClips(GameObject objectWithPlayableDirector,
                     }
                 }
             }
-            
-            /// <summary>
-            /// Validate the menu item defined by the function OnPlayableDirectorGameObjectContextClick.
-            /// </summary>
-            [MenuItem(ClipMenuItemName, true, 31)]
-            public static bool ValidateClipContextClick()
-            {
-                Object[] selection = Selection.objects;
-
-                if (selection == null || selection.Length == 0)
-                {
-                    return false;
-                }
-
-                foreach (Object obj in selection)
-                {
-                    GameObject gameObj = obj as GameObject;
-                    if (gameObj != null && gameObj.GetComponent<PlayableDirector>() != null)
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
 
             /// <summary>
             /// Add a menu item "Export Model..." to a GameObject's context menu.