Merge pull request #758 from anatawa12/fix-nre-with-null-colliders

fix: NRE if some specified colliders are null
anatawa12 · Nov 29, 2023 · 6ed9257 · 6ed9257
2 parents ee9803a + 392245e
commit 6ed9257
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- Error if there are None colliders for PhysBone `#758`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- Error if there are None colliders for PhysBone `#758`
 
 ### Security
 

diff --git a/Editor/Processors/TraceAndOptimize/OptimizePhysBone.cs b/Editor/Processors/TraceAndOptimize/OptimizePhysBone.cs
@@ -115,8 +115,9 @@ bool IsAnimated()
 
             foreach (var physBone in context.GetComponents<VRCPhysBoneBase>())
                 for (var i = 0; i < physBone.colliders.Count; i++)
-                    if (mergedColliders.TryGetValue(physBone.colliders[i], out var mergedTo))
-                        physBone.colliders[i] = mergedTo;
+                    if (physBone.colliders[i])
+                        if (mergedColliders.TryGetValue(physBone.colliders[i], out var mergedTo))
+                            physBone.colliders[i] = mergedTo;
 
             foreach (var colliderBase in mergedColliders.Keys.ToList())
                 Object.DestroyImmediate(colliderBase);