Merge pull request #1341 from anatawa12/broken-layer-override-support

fix: broken synced Layer support

CHANGELOG-PRERELEASE.md

@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - Error with nested merge skinned mesh `#1340`
+- Broken synced Layer support `#1341`
 
 ### Security
 

CHANGELOG.md

@@ -91,7 +91,7 @@ The format is based on [Keep a Changelog].
 - Renamed debug options internally `#1228`
   - This will lose previously configured debug options.
   - However, debug options are not considered as Public API as stated in documents so this is not backward incompatible changes in semver 2.0.0 section 8.
-- Performance Improvements `#1234` `#1243` `#1240` `#1288` `#1304` `#1307` `#1314` `#1325` `#1327` `#1326`
+- Performance Improvements `#1234` `#1243` `#1240` `#1288` `#1304` `#1307` `#1314` `#1325` `#1327` `#1326` `#1341`
 - Transform gizmo are now hidden while you're editing box of Remove Mesh in Box `#1259`
   - This prevents mistakenly moving the Skinned Mesh Renderer while editing the box.
 - Make MergePhysBone implement `INetworkID` `#1260`

Editor/ObjectMapping/ObjectMappingContext.cs

@@ -215,8 +215,17 @@ public void FixAnimatorController(AnimatorController? controller)
             foreach (var layer in layers)
             {
                 FixAvatarMask(layer.avatarMask);
-                foreach (var animatorState in ACUtils.AllStates(layer.stateMachine))
-                    animatorState.motion = MapMotion(animatorState.motion);
+                if (layer.syncedLayerIndex != -1)
+                {
+                    foreach (var animatorState in ACUtils.AllStates(layers[layer.syncedLayerIndex].stateMachine))
+                        if (layer.GetOverrideMotion(animatorState) is {} motion)
+                            layer.SetOverrideMotion(animatorState, motion);
+                }
+                else
+                {
+                    foreach (var animatorState in ACUtils.AllStates(layer.stateMachine))
+                        animatorState.motion = MapMotion(animatorState.motion);
+                }
             }
             controller.layers = layers;
             foreach (var stateMachineBehaviour in ACUtils.StateMachineBehaviours(controller))