Merge pull request #987 from anatawa12/merge-1.6

merge 1.6.10
anatawa12 · Apr 5, 2024 · 4d2a496 · 4d2a496
2 parents dcaf7c5 + faf60c8
commit 4d2a496
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -20,6 +20,10 @@ The format is based on [Keep a Changelog].
 
 ### Security
 
+## [1.6.10] - 2024-04-05
+### Fixed
+- Missing Reference Exception with Trace and Optimize [`#986`](https://github.com/anatawa12/AvatarOptimizer/pull/986)
+
 ## [1.7.0-beta.3] - 2024-04-04
 ### Added
 - Merge non Direct BlendTree in MergeDirectBlendTree [`#980`](https://github.com/anatawa12/AvatarOptimizer/pull/980)
@@ -1288,7 +1292,8 @@ This release is mistake.
 - Merge Bone
 - Clear Endpoint Position
 
-[Unreleased]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.7.0-beta.3...HEAD
+[Unreleased]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.6.10...HEAD
+[1.6.10]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.7.0-beta.3...v1.6.10
 [1.7.0-beta.3]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.7.0-beta.2...v1.7.0-beta.3
 [1.7.0-beta.2]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.7.0-beta.1...v1.7.0-beta.2
 [1.7.0-beta.1]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.6.9...v1.7.0-beta.1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -96,6 +96,10 @@ The format is based on [Keep a Changelog].
 
 ### Security
 
+## [1.6.10] - 2024-04-05
+### Fixed
+- Missing Reference Exception with Trace and Optimize [`#986`](https://github.com/anatawa12/AvatarOptimizer/pull/986)
+
 ## [1.6.9] - 2024-03-27
 ### Added
 - Support for VRCSDK 3.5.2 [`#926`](https://github.com/anatawa12/AvatarOptimizer/pull/926) [`#935`](https://github.com/anatawa12/AvatarOptimizer/pull/935)
@@ -834,7 +838,8 @@ The format is based on [Keep a Changelog].
 - Merge Bone
 - Clear Endpoint Position
 
-[Unreleased]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.6.9...HEAD
+[Unreleased]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.6.10...HEAD
+[1.6.10]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.6.9...v1.6.10
 [1.6.9]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.6.8...v1.6.9
 [1.6.8]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.6.7...v1.6.8
 [1.6.7]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.6.6...v1.6.7

diff --git a/Editor/Processors/TraceAndOptimize/FindUnusedObjectsProcessor.cs b/Editor/Processors/TraceAndOptimize/FindUnusedObjectsProcessor.cs
@@ -131,7 +131,9 @@ private void ActivenessAnimation(GCComponentInfoHolder componentInfos)
 
                         do
                         {
-                            var current = GetEntrypointActiveness(enumerator.Current, _context);
+                            var component = enumerator.Current;
+                            if (component == null) continue;
+                            var current = GetEntrypointActiveness(component, _context);
                             resultSet.IntersectWith(current);
                         } while (enumerator.MoveNext() && resultSet.Count != 0);
                     }