From df8d0d7981a9badaa76061d34eb10e31ba1522b9 Mon Sep 17 00:00:00 2001 From: bd_ Date: Sat, 17 Dec 2022 16:35:50 +0900 Subject: [PATCH] Workaround Merge Armature breaking parent PBs The Merge Armature logic is in need of an overall rewrite, but this works around issues where added (duplicate) bones break PBs in parents, by adding these to parent PB ignore lists. --- Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs b/Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs index 01ef7fc2..1b4d7076 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs @@ -327,6 +327,9 @@ namespace nadena.dev.modular_avatar.core.editor transformPath = RuntimeUtil.AvatarRootPath(newParent), path = srcPath }); + // The new merged leaf (if it's retained below) can break parent bone physbones. Add a PB Blocker + // to prevent this becoming an issue. + mergedSrcBone.GetOrAddComponent(); } BoneRemappings[src.transform] = mergedSrcBone.transform;