Merge pull request #700 from anatawa12/move-only-not-path-changed

Move only not path changed
anatawa12 · Nov 8, 2023 · 81d012f · 81d012f
2 parents daf036d + 1515b9c
commit 81d012f
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 117 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog].
 ### Fixed
 - eyelids BlendShape Removed error for non-AAO avatars `#696`
 - bounds can be changed in apply on play if updateWhenOffscreen is true `#697`
+- Animations for most components under MergeBone is not mapped `#700`
 
 ### Security
 

diff --git a/Editor/ObjectMapping/AnimationObjectMapper.cs b/Editor/ObjectMapping/AnimationObjectMapper.cs
@@ -132,6 +132,7 @@ public string MapPath(string srcPath, Type type)
                 {
                     // if mapped one is exactly same as original, return null
                     if (newProp.AllCopiedTo.Length == 1
+                        && gameObjectInfo.NewPath == path
                         && newProp.AllCopiedTo[0].InstanceId == instanceId
                         && newProp.AllCopiedTo[0].Name == propertyName)
                         return null;
@@ -186,25 +187,5 @@ public string MapPath(string srcPath, Type type)
                 return new[] { (gameObjectInfo.NewPath, type, propertyName) };
             }
         }
-
-        [CanBeNull]
-        public EditorCurveBinding[] MapBinding(EditorCurveBinding binding)
-        {
-            var mappedBindings = MapBinding(binding.path, binding.type, binding.propertyName);
-            if (mappedBindings == null)
-            {
-                return null;
-            }
-
-            var curveBindings = new EditorCurveBinding[mappedBindings.Length];
-            for (var i = 0; i < mappedBindings.Length; i++)
-            {
-                binding.path = mappedBindings[i].path;
-                binding.type = mappedBindings[i].type;
-                binding.propertyName = mappedBindings[i].propertyName;
-                curveBindings[i] = binding; // copy everything else
-            }
-            return curveBindings;
-        }
     }
 }
diff --git a/Editor/ObjectMapping/ObjectMappingContext.cs b/Editor/ObjectMapping/ObjectMappingContext.cs
@@ -176,7 +176,7 @@ private Object CustomClone(Object o)
 
                 foreach (var binding in AnimationUtility.GetCurveBindings(clip))
                 {
-                    var newBindings = _mapping.MapBinding(binding);
+                    var newBindings = _mapping.MapBinding(binding.path, binding.type, binding.propertyName);
                     if (newBindings == null)
                     {
                         newClip.SetCurve(binding.path, binding.type, binding.propertyName,
@@ -195,7 +195,7 @@ private Object CustomClone(Object o)
 
                 foreach (var binding in AnimationUtility.GetObjectReferenceCurveBindings(clip))
                 {
-                    var newBindings = _mapping.MapBinding(binding);
+                    var newBindings = _mapping.MapBinding(binding.path, binding.type, binding.propertyName);
                     if (newBindings == null)
                     {
                         AnimationUtility.SetObjectReferenceCurve(newClip, binding,
@@ -204,10 +204,14 @@ private Object CustomClone(Object o)
                     else
                     {
                         _mapped = true;
-                        foreach (var newBinding in newBindings)
+                        foreach (var tuple in newBindings)
                         {
+                            var newBinding = binding;
+                            newBinding.path = tuple.path;
+                            newBinding.type = tuple.type;
+                            newBinding.propertyName = tuple.propertyName;
                             AnimationUtility.SetObjectReferenceCurve(newClip, newBinding,
-                                AnimationUtility.GetObjectReferenceCurve(clip, binding));
+                                AnimationUtility.GetObjectReferenceCurve(clip, newBinding));
                         }
                     }
                 }