Skip to content

Commit 45f8a14

Browse files
committed
add function to check if object is editor clip
1 parent 1a28f4e commit 45f8a14

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

Packages/com.unity.formats.fbx/Editor/Scripts/FbxExporter.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2928,7 +2928,7 @@ internal static Dictionary<GameObject, IExportData> GetExportData(Object[] objec
29282928
{
29292929
exportData[go] = GetExportData(go, exportOptions);
29302930
}
2931-
else if (obj.GetType().Name.Contains("EditorClip"))
2931+
else if (IsEditorClip(obj))
29322932
{
29332933
KeyValuePair<GameObject, AnimationClip> pair = AnimationOnlyExportData.GetGameObjectAndAnimationClip(obj);
29342934
exportData[pair.Key] = GetExportData (pair.Key, pair.Value, exportOptions);
@@ -3514,7 +3514,7 @@ static void OnClipContextClick(MenuCommand command)
35143514
foreach (Object editorClipSelected in selectedObjects)
35153515
{
35163516
// export first selected editor clip.
3517-
if (editorClipSelected.GetType().Name.Contains("EditorClip")) {
3517+
if (IsEditorClip(editorClipSelected)) {
35183518
ExportSingleTimelineClip(editorClipSelected);
35193519
return;
35203520
}
@@ -3531,14 +3531,19 @@ static bool ValidateOnClipContextClick()
35313531

35323532
foreach (Object editorClipSelected in selectedObjects)
35333533
{
3534-
if (editorClipSelected.GetType().Name.Contains("EditorClip"))
3534+
if (IsEditorClip(editorClipSelected))
35353535
{
35363536
return true;
35373537
}
35383538
}
35393539
return false;
35403540
}
35413541

3542+
internal static bool IsEditorClip(object obj)
3543+
{
3544+
return obj.GetType().Name.Contains("EditorClip");
3545+
}
3546+
35423547
internal static void ExportSingleTimelineClip(Object editorClipSelected, string filePath = null)
35433548
{
35443549
UnityEngine.Object[] exportArray = new UnityEngine.Object[] { editorClipSelected };

Packages/com.unity.formats.fbx/Editor/Scripts/IExportData.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public static GameObject GetGameObjectBoundToEditorClip(object editorClip)
133133

134134
public static KeyValuePair<GameObject, AnimationClip> GetGameObjectAndAnimationClip(Object obj)
135135
{
136-
if (!obj.GetType().Name.Contains("EditorClip"))
136+
if (!ModelExporter.IsEditorClip(obj))
137137
return new KeyValuePair<GameObject, AnimationClip>();
138138

139139
object clip = obj.GetType().GetProperty("clip").GetValue(obj, null);
@@ -150,7 +150,7 @@ public static KeyValuePair<GameObject, AnimationClip> GetGameObjectAndAnimationC
150150

151151
public static string GetFileName(Object obj)
152152
{
153-
if (obj.GetType().Name.Contains("EditorClip"))
153+
if (ModelExporter.IsEditorClip(obj))
154154
{
155155
object clip = obj.GetType().GetProperty("clip").GetValue(obj, null);
156156
TimelineClip timeLineClip = clip as TimelineClip;

0 commit comments

Comments
 (0)