Merge pull request #599 from anatawa12/blendshape-broken-with-merge-bone

fix: BlendShape broken with MergeBone Optimization
anatawa12 · Oct 15, 2023 · 67afdd7 · 67afdd7
2 parents 67820c7 + 2ca3c50
commit 67afdd7
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
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- BlendShape can be broken with MergeBone Optimization `#599`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog].
 - Constraints and Animations can be broken with Automatic MergeBone `#594`
 - NRE with SMR with None with preview system `#596`
 - Some Multi-Frame BlendShape broken `#597`
+- BlendShape can be broken with MergeBone Optimization `#599`
 
 ### Security
 

diff --git a/Editor/Processors/MergeBoneProcessor.cs b/Editor/Processors/MergeBoneProcessor.cs
@@ -164,7 +164,7 @@ private void DoBoneMap2(MeshInfo2 meshInfo2, Dictionary<Transform, Transform> me
                         var frame = frames[i];
                         frames[i] = new Vertex.BlendShapeFrame(
                             weight: frame.Weight,
-                            position: transBindPose.MultiplyPoint3x4(frame.Position),
+                            position: transBindPose.MultiplyPoint3x3(frame.Position),
                             normal: transBindPose.MultiplyPoint3x3(frame.Normal),
                             tangent: transBindPose.MultiplyPoint3x3(frame.Tangent)
                         );