From 4f5bc00d6664c9f90ab52c93e916b0b382e0723b Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 16 May 2022 19:43:24 +0200 Subject: [PATCH] [unity] Added missing null checks in SkeletonRendererCustomMaterials. Closes #2081. --- .../SkeletonRendererCustomMaterials.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs index a8cd8ce5a..9a1e1cf56 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs @@ -90,7 +90,8 @@ namespace Spine.Unity { continue; Slot slotObject = skeletonRenderer.skeleton.FindSlot(slotMaterialOverride.slotName); - skeletonRenderer.CustomSlotMaterials[slotObject] = slotMaterialOverride.material; + if (slotObject != null) + skeletonRenderer.CustomSlotMaterials[slotObject] = slotMaterialOverride.material; } } @@ -106,7 +107,8 @@ namespace Spine.Unity { continue; Slot slotObject = skeletonRenderer.skeleton.FindSlot(slotMaterialOverride.slotName); - + if (slotObject == null) + continue; Material currentMaterial; if (!skeletonRenderer.CustomSlotMaterials.TryGetValue(slotObject, out currentMaterial)) continue;