diff --git a/spine-godot/build/setup.sh b/spine-godot/build/setup.sh index f5e5542c0..7a847f5dd 100755 --- 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 ? ?" 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 index 0fe7adae3..caf1786f3 100644 --- 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 @@ 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 6a924014c..22c91da9a 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.60", + "version": "4.2.61", "unity": "2018.3", "author": { "name": "Esoteric Software",