Merge pull request #708 from anatawa12/fix-enablement

fix: enablement detection doesn't use activeness of parents
anatawa12 · Nov 11, 2023 · a484de5 · a484de5
2 parents a98e8a2 + d23a66f
commit a484de5
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/Editor/Processors/SkinnedMeshes/MergeSkinnedMeshProcessor.cs b/Editor/Processors/SkinnedMeshes/MergeSkinnedMeshProcessor.cs
@@ -33,7 +33,17 @@ public override void Process(BuildContext context, MeshInfo2 target)
             List<MeshRenderer> staticMeshRenderers;
             if (Component.skipEnablementMismatchedRenderers)
             {
-                bool RendererEnabled(Renderer x) => x.enabled && x.gameObject.activeSelf;
+                bool RendererEnabled(Renderer x)
+                {
+                    if (!x.enabled) return false;
+                    for (var transform = x.transform;
+                         transform != null && transform != context.AvatarRootTransform;
+                         transform = transform.parent)
+                        if (!transform.gameObject.activeSelf)
+                            return false;
+                    return true;
+                }
+
                 var enabledSelf = RendererEnabled(Target);
                 skinnedMeshRenderers = SkinnedMeshRenderers.Where(x => RendererEnabled(x) == enabledSelf).ToList();
                 staticMeshRenderers = StaticMeshRenderers.Where(x => RendererEnabled(x) == enabledSelf).ToList();