From ff3492d941ad7cbad5c9e0fb60d18f9a04b7c16f Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Fri, 20 Sep 2024 11:31:52 +0200 Subject: [PATCH] [unity] Fixed a potential null reference exception, potentially leading to failing drag and drop instantiation. --- .../Editor/Utility/BlendModeMaterialsUtility.cs | 12 ++++++++++++ spine-unity/Assets/Spine/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/BlendModeMaterialsUtility.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/BlendModeMaterialsUtility.cs index 8f920da52..09f080004 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/BlendModeMaterialsUtility.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/BlendModeMaterialsUtility.cs @@ -207,6 +207,18 @@ namespace Spine.Unity.Editor { if (File.Exists(blendMaterialPath)) { newReplacement.material = AssetDatabase.LoadAssetAtPath(blendMaterialPath); } else { + if (materialTemplate == null) { + Debug.LogError(string.Format("Failed to create blend mode material: Material template for " + + "blend mode '{0}' was null. Re-importing might fix this issue.", + materialSuffix), originalMaterial); + return null; + } + if (originalMaterial == null) { + Debug.LogError(string.Format("Failed to create blend mode material for atlas page '{0}': Original material for " + + "blend mode '{1}' was null. Re-importing might fix this issue.", + originalPage.name, materialSuffix)); + return null; + } Material blendModeMaterial = new Material(materialTemplate) { name = originalMaterial.name + " " + materialTemplate.name, mainTexture = originalMaterial.mainTexture diff --git a/spine-unity/Assets/Spine/package.json b/spine-unity/Assets/Spine/package.json index 2ed19ad02..94b1c9a08 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.2.85", + "version": "4.2.86", "unity": "2018.3", "author": { "name": "Esoteric Software",