Skip to content

Commit 0a9fb75

Browse files
committed
code review fix
1 parent abd10e3 commit 0a9fb75

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -931,15 +931,15 @@ internal static void CopyComponents(GameObject to, GameObject from, GameObject r
931931

932932
FixSceneReferences(fromComponent, toComponent, root);
933933

934-
// SkinnedMeshRenderer stores both the mesh and materials.
935-
// Make sure these do not get copied over when the SkinnedMeshRenderer is updated.
934+
// SkinnedMeshRenderer also stores the mesh.
935+
// Make sure this is not copied over when the SkinnedMeshRenderer is updated,
936+
// as we want to keep the mesh from the FBX not the scene.
936937
if (fromComponent is SkinnedMeshRenderer)
937938
{
938939
var skinnedMesh = toComponent as SkinnedMeshRenderer;
939940
var mesh = skinnedMesh.sharedMesh;
940941
EditorJsonUtility.FromJsonOverwrite(json, toComponent);
941-
var toSkinnedMesh = toComponent as SkinnedMeshRenderer;
942-
toSkinnedMesh.sharedMesh = mesh;
942+
skinnedMesh.sharedMesh = mesh;
943943
}
944944
else
945945
{

0 commit comments

Comments
 (0)