Merge pull request #1367 from anatawa12/exclusions-may-removed-in-pro…

…cess-of-avatar-optimizer fix: Errors if objects removed by some component is listed on exclusions of Trace and Optimize
anatawa12 · Dec 8, 2024 · e1ecba5 · e1ecba5
2 parents 5df9b79 + a4ae0f3
commit e1ecba5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog].
 ### Fixed
 - Errors with models with UV at very edge `#1363`
 - Errors if exactly same AnimatorController is specified for multiple playable layers `#1366`
+- Errors if objects removed by some component is listed on exclusions of Trace and Optimize `#1367`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog].
 ### Fixed
 - Errors with models with UV at very edge `#1363`
 - Errors if exactly same AnimatorController is specified for multiple playable layers `#1366`
+- Errors if objects removed by some component is listed on exclusions of Trace and Optimize `#1367`
 
 ### Security
 

diff --git a/Editor/Processors/TraceAndOptimize/FindUnusedObjectsProcessor.cs b/Editor/Processors/TraceAndOptimize/FindUnusedObjectsProcessor.cs
@@ -70,7 +70,7 @@ public void MarkRecursively()
     internal readonly struct FindUnusedObjectsProcessor
     {
         private readonly BuildContext _context;
-        private readonly HashSet<GameObject> _exclusions;
+        private readonly HashSet<GameObject?> _exclusions;
         private readonly bool _preserveEndBone;
         private readonly bool _noConfigureMergeBone;
         private readonly bool _noActivenessAnimation;
@@ -248,8 +248,9 @@ private void Mark(GCComponentInfoHolder componentInfos)
                 var markContext = new MarkObjectContext(componentInfos, _context.AvatarRootTransform, GetDependantMap);
 
                 foreach (var gameObject in _exclusions)
-                foreach (var component in gameObject.GetComponents<Component>())
-                    markContext.MarkComponent(component, GCComponentInfo.DependencyType.Normal);
+                    if (gameObject != null)
+                        foreach (var component in gameObject.GetComponents<Component>())
+                            markContext.MarkComponent(component, GCComponentInfo.DependencyType.Normal);
 
                 markContext.MarkRecursively();
             }
@@ -308,8 +309,9 @@ private void MarkDependant(GCComponentInfoHolder componentInfos)
                 var markContext = new MarkObjectContext(componentInfos, _context.AvatarRootTransform, GetDependantMap);
 
                 foreach (var gameObject in _exclusions)
-                foreach (var component in gameObject.GetComponents<Component>())
-                    markContext.MarkComponent(component, GCComponentInfo.DependencyType.Normal);
+                    if (gameObject != null)
+                        foreach (var component in gameObject.GetComponents<Component>())
+                            markContext.MarkComponent(component, GCComponentInfo.DependencyType.Normal);
 
                 markContext.MarkRecursively();
             }

diff --git a/Internal/TraceAndOptimizeBase/TraceAndOptimizeProcessor.cs b/Internal/TraceAndOptimizeBase/TraceAndOptimizeProcessor.cs
@@ -18,7 +18,7 @@ public class TraceAndOptimizeState
         public bool MmdWorldCompatibility = true;
 
         public bool PreserveEndBone;
-        public HashSet<GameObject> Exclusions = new HashSet<GameObject>();
+        public HashSet<GameObject?> Exclusions = new();
         public bool GCDebug;
         public bool NoConfigureMergeBone;
         public bool NoActivenessAnimation;
@@ -56,7 +56,7 @@ internal void Initialize(TraceAndOptimize config)
 
             PreserveEndBone = config.preserveEndBone;
 
-            Exclusions = new HashSet<GameObject>(config.debugOptions.exclusions);
+            Exclusions = new HashSet<GameObject?>(config.debugOptions.exclusions);
             GCDebug = config.debugOptions.gcDebug;
             NoConfigureMergeBone = config.debugOptions.noConfigureMergeBone;
             NoActivenessAnimation = config.debugOptions.noActivenessAnimation;

diff --git a/Runtime/TraceAndOptimize.cs b/Runtime/TraceAndOptimize.cs
@@ -102,7 +102,7 @@ internal TraceAndOptimize()
         internal struct DebugOptions
         {
             [Tooltip("Exclude some GameObjects from Trace and Optimize")]
-            public GameObject[] exclusions;
+            public GameObject?[] exclusions;
             [Tooltip("Add GC Debug Components instead of setting GC components")]
             [ToggleLeft]
             public bool gcDebug;