Browse Source

[unity] Fixed SkeletonRenderSeparator with CustomMaterialOverride potentially throwing ArgumentNullException. Closes #2435.

Harald Csaszar 1 year ago
parent
commit
05de65cf9e

+ 2 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshGenerator.cs

@@ -458,6 +458,8 @@ namespace Spine.Unity {
 			SubmeshInstruction[] wsii = workingSubmeshInstructions.Items;
 			SubmeshInstruction[] wsii = workingSubmeshInstructions.Items;
 			for (int i = 0; i < workingSubmeshInstructions.Count; i++) {
 			for (int i = 0; i < workingSubmeshInstructions.Count; i++) {
 				Material material = wsii[i].material;
 				Material material = wsii[i].material;
+				if (material == null) continue;
+
 				Material overrideMaterial;
 				Material overrideMaterial;
 				if (customMaterialOverride.TryGetValue(material, out overrideMaterial))
 				if (customMaterialOverride.TryGetValue(material, out overrideMaterial))
 					wsii[i].material = overrideMaterial;
 					wsii[i].material = overrideMaterial;