Merge pull request #1324 from anatawa12/fix-animation-merge-blendhsape

fix: animation broken with auto merge blendShape

CHANGELOG-PRERELEASE.md

@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- Animation broken with auto merge blendShape `#1324`
 
 ### Security
 

CHANGELOG.md

@@ -49,7 +49,7 @@ The format is based on [Keep a Changelog].
   - When you changed shader for an material, properties for previously used shaders might be remain
   - This may increase your avatar size by unexpectedly including unused textures
 - Right-click menu option to create a new GameObject with a specified component [`#1290`](https://github.com/anatawa12/AvatarOptimizer/pull/1290)
-- Automatically Merge Blendshape `#1300`
+- Automatically Merge Blendshape `#1300` `#1324`
   - This is new automatic optimization in Trace and Optimize
   - This is a part of "Optimize BlendShape" optimization.
   - AAO 1.8.0 introduced BlendShape support for Merge Skinned Mesh, but new default mode "Rename to avoid conflicts" would increase number of BlendShape.

Editor/Processors/TraceAndOptimize/AutoMergeBlendShape.cs

@@ -51,6 +51,8 @@ private static void DoAutoMerge(MeshInfo2 meshInfo2, BuildContext context)
         // bulk remove to optimize removing blendshape process
         var removeNames = new HashSet<string>();
 
+        var newNames = new Dictionary<string, string>();
+
         var i = 0;
         // there is thing to merge
         foreach (var (key, names) in groups)
@@ -82,6 +84,12 @@ private static void DoAutoMerge(MeshInfo2 meshInfo2, BuildContext context)
             // validation passed, merge
             var newName = $"AAO_Merged_{string.Join("_", names)}_{i++}";
 
+            foreach (var name in names)
+            {
+                newNames.Add(name, newName);
+                context.RecordMoveProperty(meshInfo2.SourceRenderer, $"blendShape.{name}", $"blendShape.{newName}");
+            }
+
             // process meshInfo2
             meshInfo2.BlendShapes.Add((newName, key.defaultWeight));
             removeNames.UnionWith(names);
@@ -131,8 +139,22 @@ private static void DoAutoMerge(MeshInfo2 meshInfo2, BuildContext context)
             next_shape: ;
         }
 
+        var prevNames = meshInfo2.BlendShapes.Select(x => x.name).ToList();
+
         // remove merged blendShapes
         meshInfo2.BlendShapes.RemoveAll(x => removeNames.Contains(x.name));
+
+        for (var index = 0; index < prevNames.Count; index++)
+        {
+            var name = prevNames[index];
+            var newName = newNames.GetValueOrDefault(name, name);
+            var newIndex = meshInfo2.BlendShapes.FindIndex(x => x.name == newName);
+            if (newIndex != -1)
+            {
+                context.RecordMoveProperty(meshInfo2.SourceRenderer, 
+                    VProp.BlendShapeIndex(index), VProp.BlendShapeIndex(newIndex));
+            }
+        }
     }
 
     readonly struct MergeKey : IEquatable<MergeKey>