Skip to content

Commit 3a43326

Browse files
committed
cleanup duplicate code
1 parent a948f01 commit 3a43326

File tree

1 file changed

+10
-23
lines changed

1 file changed

+10
-23
lines changed

Assets/FbxExporters/Editor/FbxExporter.cs

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -865,40 +865,27 @@ SkinnedMeshRenderer unitySkin
865865

866866

867867
var meshInfo = new MeshInfo(unitySkin.sharedMesh, unitySkin.sharedMaterials);
868+
868869
FbxMesh fbxMesh = null;
870+
if (ExportMesh(meshInfo, fbxNode))
871+
{
872+
fbxMesh = fbxNode.GetMesh();
873+
}
874+
if (fbxMesh == null)
875+
{
876+
Debug.LogError("Could not find mesh");
877+
return false;
878+
}
869879

870880
Dictionary<SkinnedMeshRenderer, Transform[]> skinnedMeshToBonesMap;
871881
// export skeleton
872882
if (ExportSkeleton (unitySkin, fbxScene, out skinnedMeshToBonesMap)) {
873-
874-
// export skin mesh
875-
if (ExportMesh (meshInfo, fbxNode)) {
876-
fbxMesh = fbxNode.GetMesh ();
877-
}
878-
879-
if (fbxMesh == null) {
880-
Debug.LogError ("Could not find mesh");
881-
return false;
882-
}
883-
884883
// bind mesh to skeleton
885884
ExportSkin (unitySkin, meshInfo, fbxScene, fbxMesh, fbxNode);
886885

887886
// add bind pose
888887
ExportBindPose (unitySkin, fbxNode, fbxScene, skinnedMeshToBonesMap);
889888
}
890-
else
891-
{
892-
// SkinnedMeshRenderer has no bones. this is expected situation.
893-
// (e.g. mesh has blend shapes but no skeleton)
894-
if (ExportMesh(meshInfo, fbxNode)) {
895-
fbxMesh = fbxNode.GetMesh();
896-
}
897-
if (fbxMesh == null) {
898-
Debug.LogError("Could not find mesh");
899-
return false;
900-
}
901-
}
902889

903890
return true;
904891
}

0 commit comments

Comments
 (0)