AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-01-01 20:25:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MergeArmatureHook ignoring disabled objects

Browse Source
This commit is contained in:
bd_ 2022-11-03 19:19:43 -07:00
parent 1078c31591
commit a4da85977d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ namespace net.fushizen.modular_avatar.core.editor
UnityEngine.Object.DestroyImmediate(mergeArmature); UnityEngine.Object.DestroyImmediate(mergeArmature);
} }
foreach (var renderer in avatarGameObject.transform.GetComponentsInChildren<SkinnedMeshRenderer>()) foreach (var renderer in avatarGameObject.transform.GetComponentsInChildren<SkinnedMeshRenderer>(true))
{ {
var bones = renderer.bones; var bones = renderer.bones;
for (int i = 0; i < bones.Length; i++) bones[i] = MapBoneReference(bones[i], Retargetable.Ignore); for (int i = 0; i < bones.Length; i++) bones[i] = MapBoneReference(bones[i], Retargetable.Ignore);
@ -65,25 +65,25 @@ namespace net.fushizen.modular_avatar.core.editor
renderer.probeAnchor = MapBoneReference(renderer.probeAnchor); renderer.probeAnchor = MapBoneReference(renderer.probeAnchor);
} }
foreach (var c in avatarGameObject.transform.GetComponentsInChildren<VRCPhysBone>()) foreach (var c in avatarGameObject.transform.GetComponentsInChildren<VRCPhysBone>(true))
{ {
if (c.rootTransform == null) c.rootTransform = c.transform; if (c.rootTransform == null) c.rootTransform = c.transform;
UpdateBoneReferences(c); UpdateBoneReferences(c);
} }
foreach (var c in avatarGameObject.transform.GetComponentsInChildren<VRCPhysBoneCollider>()) foreach (var c in avatarGameObject.transform.GetComponentsInChildren<VRCPhysBoneCollider>(true))
{ {
if (c.rootTransform == null) c.rootTransform = c.transform; if (c.rootTransform == null) c.rootTransform = c.transform;
UpdateBoneReferences(c); UpdateBoneReferences(c);
} }
foreach (var c in avatarGameObject.transform.GetComponentsInChildren<ContactBase>()) foreach (var c in avatarGameObject.transform.GetComponentsInChildren<ContactBase>(true))
{ {
if (c.rootTransform == null) c.rootTransform = c.transform; if (c.rootTransform == null) c.rootTransform = c.transform;
UpdateBoneReferences(c); UpdateBoneReferences(c);
} }
foreach (var c in avatarGameObject.transform.GetComponentsInChildren<IConstraint>()) foreach (var c in avatarGameObject.transform.GetComponentsInChildren<IConstraint>(true))
{ {
if (!AddedConstraints.Contains(c)) if (!AddedConstraints.Contains(c))
{ {