Merge pull request #451 from anatawa12/remove-mesh-with-blendshape-wi…

…th-merge-skinned-mesh fix: RemoveMeshByBlendShape on the SMR with MergeSkinnedMesh not working
anatawa12 · Sep 11, 2023 · 931a823 · 931a823
2 parents 71e80b6 + 7195056
commit 931a823
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog].
 ### Fixed
 - MergeBone will break Normal and Tangent `#448`
 - PhysBone for Animator Parameter disappears `#452`
+- RemoveMeshByBlendShape on the SkinnedMeshRenderer with MergeSkinnedMesh not working `#451`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog].
 - Crash with Unity 2022 `#423`
   - [Due to bug in Unity Editor 2022.3 or later][unity-bug], Avatar Optimizer was not compatible with Unity 2022.
 - Error if all vertices of some BlendShape is removed by RemoveMeshByBlendShape or RemoveMeshInBox `#440`
+- RemoveMeshByBlendShape on the SkinnedMeshRenderer with MergeSkinnedMesh not working `#451`
 
 [unity-bug]: https://issuetracker.unity3d.com/issues/crash-on-gettargetassemblybyscriptpath-when-a-po-file-in-the-packages-directory-is-not-under-an-assembly-definition
 

diff --git a/Editor/Processors/TraceAndOptimize/AnimatorParser.cs b/Editor/Processors/TraceAndOptimize/AnimatorParser.cs
@@ -176,6 +176,35 @@ private void OtherMutateComponents(ModificationsContainer mod, OptimizerSession
                             updater.AddModificationAsNewLayer(prop, AnimationProperty.Variable());
                         break;
                     }
+                    case RemoveMeshByBlendShape removeMesh:
+                    {
+                        var blendShapes = removeMesh.RemovingShapeKeys;
+                        {
+                            var updater = mod.ModifyObject(removeMesh.GetComponent<SkinnedMeshRenderer>());
+                            foreach (var blendShape in blendShapes)
+                                updater.AddModificationAsNewLayer($"blendShape.{blendShape}",
+                                    AnimationProperty.Variable());
+                        }
+
+                        DeriveMergeSkinnedMeshProperties(removeMesh.GetComponent<MergeSkinnedMesh>());
+
+                        void DeriveMergeSkinnedMeshProperties(MergeSkinnedMesh mergeSkinnedMesh)
+                        {
+                            if (mergeSkinnedMesh == null) return;
+
+                            foreach (var renderer in mergeSkinnedMesh.renderersSet.GetAsSet())
+                            {
+                                var updater = mod.ModifyObject(renderer);
+                                foreach (var blendShape in blendShapes)
+                                    updater.AddModificationAsNewLayer($"blendShape.{blendShape}",
+                                        AnimationProperty.Variable());
+
+                                DeriveMergeSkinnedMeshProperties(renderer.GetComponent<MergeSkinnedMesh>());
+                            }
+                        }
+
+                        break;
+                    }
                     default:
                     {
                         if (DynamicBone.TryCast(component, out var dynamicBone))