Merge branch '4.1' into 4.2-beta

EsotericSoftware · Apr 11, 2024 · 49350d1 · 49350d1
2 parents 3938424 + 1274c9c
commit 49350d1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/spine-godot/build/setup.sh b/spine-godot/build/setup.sh
@@ -8,7 +8,7 @@ if [ $# -lt 2 ] || [ $# -gt 4 ]; then
 	echo "Usage: ./setup.sh <Godot branch or tag> <dev:true|false> <mono:true|false>? <godot-repository>?"
 	echo
 	echo "e.g.:"
-	echo "       ./setup.sh 4.1.3-stable true"
+	echo "       ./setup.sh 4.2.1-stable true"
 	echo "       ./setup.sh master false true"
 	echo "       ./setup.sh master false false https://github.com/my-github-username/godot.git"
 	echo

diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs
@@ -822,7 +822,12 @@ public class SpriteMaskInteractionMaterials {
 			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
@@ -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.60",
+	"version": "4.2.61",
 	"unity": "2018.3",
 	"author": {
 		"name": "Esoteric Software",