UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Harald Csaszar 2024-04-11 18:46:29 +02:00
commit 49350d1174
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-godot/build/setup.sh
View File

@ -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 "Usage: ./setup.sh <Godot branch or tag> <dev:true|false> <mono:true|false>? <godot-repository>?"
echo echo
echo "e.g.:" 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 true"
echo " ./setup.sh master false false https://github.com/my-github-username/godot.git" echo " ./setup.sh master false false https://github.com/my-github-username/godot.git"
echo echo

7
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs
View File

@ -822,7 +822,12 @@ namespace Spine.Unity {
Material[] originalMaterials = maskMaterials.materialsMaskDisabled; Material[] originalMaterials = maskMaterials.materialsMaskDisabled;
materialsToFill = new Material[originalMaterials.Length]; materialsToFill = new Material[originalMaterials.Length];
for (int i = 0; i < originalMaterials.Length; i++) { 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); newMaterial.SetFloat(STENCIL_COMP_PARAM_ID, (int)maskFunction);
materialsToFill[i] = newMaterial; materialsToFill[i] = newMaterial;
} }

2
spine-unity/Assets/Spine/package.json
View File

@ -2,7 +2,7 @@
"name": "com.esotericsoftware.spine.spine-unity", "name": "com.esotericsoftware.spine.spine-unity",
"displayName": "spine-unity Runtime", "displayName": "spine-unity Runtime",
"description": "This plugin provides the spine-unity runtime core.", "description": "This plugin provides the spine-unity runtime core.",
"version": "4.2.60", "version": "4.2.61",
"unity": "2018.3", "unity": "2018.3",
"author": { "author": {
"name": "Esoteric Software", "name": "Esoteric Software",