AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-23 12:58:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix PBs referencing constrained bones not working

Browse Source 
When a PB references a bone controlled by a constraint, the subtree rooted at that
bone will be present only on the original armature tree, and not in the avatar's
main armature tree (except for a stub object that may or may not be used for a constraint
reference).

Previously, there was a bug in which PBs would reference the stub object, rather than the
object that contains the bones that need to be animated by PBs. This commit changes the order
of processing so bones are only registered for rewriting PB referenced if their subtrees will
be transferred to the main armature.
This commit is contained in:
bd_ 2022-10-04 17:47:48 -07:00 committed by bd_
parent 7ca52e5a0a
commit 3db78a769c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Packages/net.fushizen.modular-avatar/Editor/MergeArmatureHook.cs
View File

@ -286,20 +286,7 @@ namespace net.fushizen.modular_avatar.core.editor
mergedSrcBone.transform.localPosition = src.transform.localPosition;
mergedSrcBone.transform.localRotation = src.transform.localRotation;
mergedSrcBone.transform.localScale = src.transform.localScale;
if (zipMerge)
{
BoneDatabase.AddMergedBone(mergedSrcBone.transform);
var srcPath = RuntimeUtil.AvatarRootPath(src);
PathMappings.Remap(srcPath, new PathMappings.MappingEntry()
{
transformPath = RuntimeUtil.AvatarRootPath(newParent),
path = srcPath
});
}
mergedSrcBone.transform.SetParent(newParent.transform, true);
BoneRemappings[src.transform] = mergedSrcBone.transform;
bool retain = HasAdditionalComponents(src, out var constraintType);
if (constraintType != null)
@ -331,6 +318,19 @@ namespace net.fushizen.modular_avatar.core.editor
return true;
}
if (zipMerge)
{
BoneDatabase.AddMergedBone(mergedSrcBone.transform);
var srcPath = RuntimeUtil.AvatarRootPath(src);
PathMappings.Remap(srcPath, new PathMappings.MappingEntry()
{
transformPath = RuntimeUtil.AvatarRootPath(newParent),
path = srcPath
});
}
BoneRemappings[src.transform] = mergedSrcBone.transform;
List<Transform> children = new List<Transform>();
foreach (Transform child in src.transform)
{