From 8cf34cbe2dcc106130f0837d97de498b36c97be1 Mon Sep 17 00:00:00 2001
From: bd_ <bd_@nadena.dev>
Date: Sat, 23 Nov 2024 18:19:38 -0800
Subject: [PATCH] chore: fix test

---
 Editor/MergeArmatureHook.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Editor/MergeArmatureHook.cs b/Editor/MergeArmatureHook.cs
index f64514d1..e9896fdb 100644
--- a/Editor/MergeArmatureHook.cs
+++ b/Editor/MergeArmatureHook.cs
@@ -116,9 +116,23 @@ namespace nadena.dev.modular_avatar.core.editor
             {
                 RetainBoneReferences(c as Component);
             }
+            
             foreach (var smr in avatarGameObject.transform.GetComponentsInChildren<SkinnedMeshRenderer>(true))
             {
-                BoneDatabase.RetainMergedBone(smr.rootBone);
+                // If the root bone has been offset, or has a different sign for its scale, we need to retain it.
+                // see https://github.com/bdunderscore/modular-avatar/pull/1355
+                // (we avoid retaining otherwise to avoid excess bone transforms)
+
+                if (smr.rootBone == null || smr.rootBone.parent == null) continue;
+
+                var root = smr.rootBone;
+                var parent = root.parent;
+
+                if ((parent.position - root.position).sqrMagnitude > 0.000001f
+                    || Vector3.Dot(parent.localScale.normalized, root.localScale.normalized) < 0.9999f)
+                {
+                    BoneDatabase.RetainMergedBone(smr.rootBone);
+                }
             }
 
             new RetargetMeshes().OnPreprocessAvatar(avatarGameObject, BoneDatabase, PathMappings);