remove timeline anim arg from ExportObjects

Author: vkovec

Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

@@ -556,7 +556,7 @@ protected override bool Export(){
                     return true;
                 }
 
-                if (ModelExporter.ExportObjects (filePath, ToExport, SettingsObject, timelineAnim: m_isTimelineAnim) != null) {
+                if (ModelExporter.ExportObjects (filePath, ToExport, SettingsObject) != null) {
                     // refresh the asset database so that the file appears in the
                     // asset folder view.
                     AssetDatabase.Refresh ();

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -3339,7 +3339,7 @@ public static void ExportSingleTimelineClip(TimelineClip timelineClipSelected, G
                 };
 
                 if (!string.IsNullOrEmpty (filePath)) {
-                    ExportObjects (filePath, exportArray, timelineAnim: true);
+                    ExportObjects (filePath, exportArray);
                     return;
                 }
 
@@ -3372,7 +3372,7 @@ public static void ExportAllTimelineClips(GameObject objectWithPlayableDirector,
                         }
                         string filePath = string.Format(AnimFbxFormat, folderPath, atObject.name, timelineClip.displayName);
                         UnityEngine.Object[] myArray = new UnityEngine.Object[] { atObject, timelineClip.animationClip };
-                        ExportObjects (filePath, myArray, exportOptions, timelineAnim: true);
+                        ExportObjects (filePath, myArray, exportOptions);
                     }
                 }
             }
@@ -3866,8 +3866,7 @@ private static void OnExport ()
             public static string ExportObjects (
                 string filePath,
                 UnityEngine.Object[] objects = null,
-                IExportOptions exportOptions = null,
-                bool timelineAnim = false)
+                IExportOptions exportOptions = null)
             {
                 LastFilePath = filePath;
 
@@ -3881,7 +3880,8 @@ public static string ExportObjects (
                     }
 
                     Dictionary<GameObject, AnimationOnlyExportData> animationExportData = null;
-                    if (timelineAnim) {
+                    // if there are only two objects for export and the second is an animation clip, then we are exporting from the timeline
+                    if (objects.Length == 2 && objects[1] is AnimationClip) {
                         // We expect the first argument in the list to be the GameObject, the second one is the Animation Clip/Track we are exporting from the timeline
                         GameObject rootObject = ModelExporter.GetGameObject (objects [0]);
                         AnimationClip timelineClip = objects [1] as AnimationClip;
@@ -3909,10 +3909,9 @@ public static string ExportObjects (
 
             public static string ExportObject (
                 string filePath, UnityEngine.Object root,
-                IExportOptions exportOptions = null,
-                bool isTimelineAnim = false)
+                IExportOptions exportOptions = null)
             {
-                return ExportObjects(filePath, new Object[] { root }, exportOptions, isTimelineAnim);
+                return ExportObjects(filePath, new Object[] { root }, exportOptions);
             }
 
             private static void EnsureDirectory (string path)