fix: NRE if some bone is none

anatawa12 · Feb 1, 2023 · 88efc2a · 88efc2a
1 parent d0f1ef2
commit 88efc2a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Editor/Processors/MergeBoneProcessor.cs b/Editor/Processors/MergeBoneProcessor.cs
@@ -26,7 +26,7 @@ public void Process(OptimizerSession session)
 
             foreach (var renderer in session.GetComponents<SkinnedMeshRenderer>())
             {
-                if (renderer.bones.Any(mergeMapping.ContainsKey))
+                if (renderer.bones.Where(x => x).Any(mergeMapping.ContainsKey))
                     DoBoneMap(session, renderer, mergeMapping);
             }
 
@@ -50,12 +50,12 @@ private void DoBoneMap(OptimizerSession session, SkinnedMeshRenderer renderer,
             var oldBindposes = mesh.bindposes;
             var boneMapping = new int[oldBones.Length];
 
-            var newBones = oldBones.Where(x => !mergeMapping.ContainsKey(x)).ToArray();
+            var newBones = oldBones.Where(x => !(x && mergeMapping.ContainsKey(x))).ToArray();
             var newBindposes = new Matrix4x4[newBones.Length];
 
             for (int i = 0, j = 0; i < oldBones.Length; i++)
             {
-                if (mergeMapping.TryGetValue(oldBones[i], out var mapped))
+                if (oldBones[i] && mergeMapping.TryGetValue(oldBones[i], out var mapped))
                 {
                     var newIndex = Array.IndexOf(newBones, mapped);
                     if (newIndex == -1)