Merge pull request #284 from anatawa12/blendshape-index-collapse

fix(MergeSkinnedMesh): blendshape index collapse
anatawa12 · Aug 7, 2023 · 29468c6 · 29468c6
2 parents f31d71e + 97f57d3
commit 29468c6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - UnusedBonesByReferenceTool error with SMR without mesh `#280`
+- MergeSkinnedMesh doesn't work well with eyelids `#284`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - UnusedBonesByReferenceTool error with SMR without mesh `#280`
+- MergeSkinnedMesh doesn't work well with eyelids `#284`
 
 ### Security
 

diff --git a/Editor/Processors/SkinnedMeshes/MergeSkinnedMeshProcessor.cs b/Editor/Processors/SkinnedMeshes/MergeSkinnedMeshProcessor.cs
@@ -69,7 +69,7 @@ TexCoordStatus TexCoordStatusMax(TexCoordStatus x, TexCoordStatus y) =>
                     var newIndex = target.BlendShapes.FindIndex(x => x.name == name);
                     if (newIndex == -1)
                     {
-                        newIndex = target.BlendShapes.Count - 1;
+                        newIndex = target.BlendShapes.Count;
                         target.BlendShapes.Add((name, weight));
                     }