fix merge issues

Author: vkovec

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -2951,29 +2951,18 @@ private void ReplaceFile ()
 			[MenuItem(TimelineClipMenuItemName, false, 31)]
             static void OnClipContextClick(MenuCommand command)
             {
-                // Now that we know we have stuff to export, get the user-desired path.
-                string directory = string.IsNullOrEmpty(LastFilePath)
-                                      ? Application.dataPath
-                                      : System.IO.Path.GetDirectoryName(LastFilePath);
-
-                string title = "Select the folder in which the animation files from the timeline will be exported";
-                string folderPath = EditorUtility.SaveFolderPanel(title, directory, "");
-
-                if (string.IsNullOrEmpty(folderPath))
-                {
-                    return;
-                }
-                Debug.Log(folderPath);
-
                 Object[] selectedObjects = Selection.objects;
 
                 foreach (Object editorClipSelected in selectedObjects)
                 {
-                    ExportSingleEditorClip(editorClipSelected, folderPath);
+                    // export first selected editor clip.
+                    if (ExportSingleEditorClip (editorClipSelected)) {
+                        return;
+                    }
                 }
             }
 
-            public static void ExportSingleEditorClip(Object editorClipSelected, string folderPath)
+            public static bool ExportSingleEditorClip(Object editorClipSelected)
             {
                 if (editorClipSelected.GetType().Name.Contains("EditorClip"))
                 {
@@ -2985,13 +2974,20 @@ public static void ExportSingleEditorClip(Object editorClipSelected, string fold
 					AnimationTrack editorClipAnimationTrack = selClipItemParentTrack as AnimationTrack;
                     GameObject animationTrackGObject = UnityEditor.Timeline.TimelineEditor.playableDirector.GetGenericBinding (editorClipAnimationTrack) as GameObject;
 
-                    ExportSingleTimelineClip(timeLineClip, folderPath, animationTrackGObject);
+                    ExportSingleTimelineClip(timeLineClip, animationTrackGObject);
+                    return true;
                 } 
+                return false;
             }
 
-            public static void ExportSingleTimelineClip(TimelineClip timelineClipSelected, string folderPath, GameObject animationTrackGObject)
+            public static void ExportSingleTimelineClip(TimelineClip timelineClipSelected, GameObject animationTrackGObject, string filePath = null)
             {
-				string filePath = GetExportFilePath (animationTrackGObject.name + "@" + timeLineClip.displayName);
+                if (string.IsNullOrEmpty (filePath)) {
+                    filePath = GetExportFilePath (animationTrackGObject.name + "@" + timelineClipSelected.displayName);
+                }
+                if (string.IsNullOrEmpty (filePath)) {
+                    return;
+                }
 				UnityEngine.Object[] myArray = new UnityEngine.Object[] { animationTrackGObject, timelineClipSelected.animationClip };
 				ExportObjects(filePath, myArray, AnimationExportType.timelineAnimationClip);
             }
@@ -3040,23 +3036,19 @@ public static void OnPlayableDirectorGameObjectContextClick(MenuCommand command)
 
             public static void ExportAllTimelineClips(GameObject objectWithPlayableDirector, string folderPath)
             {
-                Debug.Log(objectWithPlayableDirector.GetType().BaseType.ToString() + ":" + objectWithPlayableDirector.name);
-
                 PlayableDirector pd = objectWithPlayableDirector.GetComponent<PlayableDirector>();
                 if (pd != null)
                 {
                     foreach (PlayableBinding output in pd.playableAsset.outputs)
                     {
                         AnimationTrack at = output.sourceObject as AnimationTrack;
 
-                            GameObject atObject = pd.GetGenericBinding(output.sourceObject) as GameObject;
-                            // One file by animation clip
-                            foreach (TimelineClip timeLineClip in at.GetClips()) {
-                                string filePath = string.Format(AnimFbxFileFormat, folderPath, atObject.name, timeLineClip.displayName);
-                                UnityEngine.Object[] myArray = new UnityEngine.Object[] { atObject, timeLineClip.animationClip };
-                                ExportObjects (filePath, myArray, AnimationExportType.timelineAnimationClip);
-
-                            }
+                        GameObject atObject = pd.GetGenericBinding(output.sourceObject) as GameObject;
+                        // One file by animation clip
+                        foreach (TimelineClip timeLineClip in at.GetClips()) {
+                            string filePath = string.Format(AnimFbxFileFormat, folderPath, atObject.name, timeLineClip.displayName);
+                            UnityEngine.Object[] myArray = new UnityEngine.Object[] { atObject, timeLineClip.animationClip };
+                            ExportObjects (filePath, myArray, AnimationExportType.timelineAnimationClip);
                         }
                     }
                 }
@@ -3634,7 +3626,6 @@ private static void OnExport (AnimationExportType exportType = AnimationExportTy
             /// Export a list of (Game) objects to FBX file. 
             /// Use the SaveFile panel to allow user to enter a file name.
             /// <summary>
-            //public static string ExportObjects (string filePath, UnityEngine.Object[] objects = null, AnimationExportType exportType = AnimationExportType.all /*, bool animOnly = false*/)
             public static string ExportObjects (
                 string filePath,
                 UnityEngine.Object[] objects = null,
@@ -3691,7 +3682,6 @@ public static string ExportObjects (
                 return null;
             }
 
-            //public static string ExportObject (string filePath, UnityEngine.Object root, AnimationExportType exportType = AnimationExportType.all /*, bool animOnly = false*/)
             public static string ExportObject (
                 string filePath, UnityEngine.Object root,
                 AnimationExportType exportType = AnimationExportType.all,

Assets/FbxExporters/Editor/UnitTests/ExportTimelineClipTest.cs

@@ -35,8 +35,9 @@ public void ExportSingleTimelineClipTest()
                     GameObject atObject = pd.GetGenericBinding (output.sourceObject) as GameObject;
                     // One file by animation clip
                     foreach (TimelineClip timeLineClip in at.GetClips()) {
-                        ModelExporter.ExportSingleTimelineClip (timeLineClip, folderPath, atObject);
-                        FileAssert.Exists (string.Format("{0}/{1}@{2}", folderPath, atObject.name, "Recorded.fbx"));
+                        var filePath = string.Format ("{0}/{1}@{2}", folderPath, atObject.name, "Recorded.fbx");
+                        ModelExporter.ExportSingleTimelineClip (timeLineClip, atObject, filePath);
+                        FileAssert.Exists (filePath);
                     }
                 }
             }