Skip to content

Commit ba7982f

Browse files
committed
fix nullrefexception when exporting object(s) without anim
1 parent 7c1d5c6 commit ba7982f

File tree

1 file changed

+26
-22
lines changed

1 file changed

+26
-22
lines changed

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

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3482,31 +3482,35 @@ internal int ExportAll (
34823482
}
34833483
}
34843484

3485-
foreach (var unityGo in revisedExportSet)
3485+
// Export animation if any
3486+
if (exportData != null)
34863487
{
3487-
IExportData iData;
3488-
if(!exportData.TryGetValue(unityGo, out iData))
3488+
foreach (var unityGo in revisedExportSet)
34893489
{
3490-
continue;
3491-
}
3492-
var data = iData as AnimationOnlyExportData;
3493-
if(data == null)
3494-
{
3495-
Debug.LogWarningFormat("FBX Exporter: no animation export data found for {0}", unityGo.name);
3496-
continue;
3497-
}
3498-
// export animation
3499-
// export default clip first
3500-
if (data.defaultClip != null)
3501-
{
3502-
var defaultClip = data.defaultClip;
3503-
ExportAnimationClip(defaultClip, data.animationClips[defaultClip], fbxScene);
3504-
data.animationClips.Remove(defaultClip);
3505-
}
3490+
IExportData iData;
3491+
if (!exportData.TryGetValue(unityGo, out iData))
3492+
{
3493+
continue;
3494+
}
3495+
var data = iData as AnimationOnlyExportData;
3496+
if (data == null)
3497+
{
3498+
Debug.LogWarningFormat("FBX Exporter: no animation export data found for {0}", unityGo.name);
3499+
continue;
3500+
}
3501+
// export animation
3502+
// export default clip first
3503+
if (data.defaultClip != null)
3504+
{
3505+
var defaultClip = data.defaultClip;
3506+
ExportAnimationClip(defaultClip, data.animationClips[defaultClip], fbxScene);
3507+
data.animationClips.Remove(defaultClip);
3508+
}
35063509

3507-
foreach (var animClip in data.animationClips)
3508-
{
3509-
ExportAnimationClip(animClip.Key, animClip.Value, fbxScene);
3510+
foreach (var animClip in data.animationClips)
3511+
{
3512+
ExportAnimationClip(animClip.Key, animClip.Value, fbxScene);
3513+
}
35103514
}
35113515
}
35123516
// Set the scene's default camera.

0 commit comments

Comments
 (0)