From 1274c9ca8440b602f9dbfebb12c9b756fcaa4dda Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Thu, 11 Apr 2024 18:43:18 +0200 Subject: [PATCH] [unity] Fixed exception when SkeletonRenderSeparator causes null material with mask materials. Closes #2499. --- .../Runtime/spine-unity/Components/SkeletonRenderer.cs | 7 ++++++- spine-unity/Assets/Spine/package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs index ebdcb7e58..7912a6d5f 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs @@ -701,7 +701,12 @@ namespace Spine.Unity { Material[] originalMaterials = maskMaterials.materialsMaskDisabled; materialsToFill = new Material[originalMaterials.Length]; for (int i = 0; i < originalMaterials.Length; i++) { - Material newMaterial = new Material(originalMaterials[i]); + Material originalMaterial = originalMaterials[i]; + if (originalMaterial == null) { + materialsToFill[i] = null; + continue; + } + Material newMaterial = new Material(originalMaterial); newMaterial.SetFloat(STENCIL_COMP_PARAM_ID, (int)maskFunction); materialsToFill[i] = newMaterial; } diff --git a/spine-unity/Assets/Spine/package.json b/spine-unity/Assets/Spine/package.json index ca90e9ff5..b4d7cfaf4 100644 --- a/spine-unity/Assets/Spine/package.json +++ b/spine-unity/Assets/Spine/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.spine-unity", "displayName": "spine-unity Runtime", "description": "This plugin provides the spine-unity runtime core.", - "version": "4.1.40", + "version": "4.1.41", "unity": "2018.3", "author": { "name": "Esoteric Software",