Fixed disabled meshes not being included in material dedup scan

bigibas123 · Jun 9, 2024 · fe037fc · fe037fc
1 parent 62df5b0
commit fe037fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Editor/MaterialDedup.cs b/Editor/MaterialDedup.cs
@@ -19,10 +19,11 @@ protected override void Configure()
 				.BeforePlugin("com.anatawa12.avatar-optimizer")
 				.Run("Deduplicate materials", ctx =>
 				{
-					var roots = ctx.AvatarRootTransform.GetComponentsInChildren<MaterialDeduplicatorBehavior>();
+					var roots = ctx.AvatarRootTransform.GetComponentsInChildren<MaterialDeduplicatorBehavior>(true);
 					foreach (var root in roots)
 					{
-						root.AsMaterialRefs(ctx.AvatarDescriptor).AsDedupList().ForEach(d => d.ApplyToDests(root.replaceEvenIfOnlyOne));
+						root.AsMaterialRefs(ctx.AvatarDescriptor).AsDedupList()
+							.ForEach(d => d.ApplyToDests(root.replaceEvenIfOnlyOne));
 						UnityEngine.Object.DestroyImmediate(root);
 					}
 				});

diff --git a/Runtime/MaterialDeduplicatorBehavior.cs b/Runtime/MaterialDeduplicatorBehavior.cs
@@ -13,8 +13,8 @@ public class MaterialDeduplicatorBehavior : MonoBehaviour, IEditorOnly
 		private static List<Renderer> GetRenderers(GameObject root)
 		{
 			var renderers = new List<Renderer>();
-			renderers.AddRange(root.GetComponentsInChildren<SkinnedMeshRenderer>());
-			renderers.AddRange(root.GetComponentsInChildren<MeshRenderer>());
+			renderers.AddRange(root.GetComponentsInChildren<SkinnedMeshRenderer>(true));
+			renderers.AddRange(root.GetComponentsInChildren<MeshRenderer>(true));
 			return renderers;
 		}
 	}