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 2023-12-19 16:53:43 +01:00
commit 0b9bab2392
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshGenerator.cs
View File

@ -491,6 +491,8 @@ namespace Spine.Unity {
SubmeshInstruction[] wsii = workingSubmeshInstructions.Items; SubmeshInstruction[] wsii = workingSubmeshInstructions.Items;
for (int i = 0; i < workingSubmeshInstructions.Count; i++) { for (int i = 0; i < workingSubmeshInstructions.Count; i++) {
Material material = wsii[i].material; Material material = wsii[i].material;
if (material == null) continue;
Material overrideMaterial; Material overrideMaterial;
if (customMaterialOverride.TryGetValue(material, out overrideMaterial)) if (customMaterialOverride.TryGetValue(material, out overrideMaterial))
wsii[i].material = overrideMaterial; wsii[i].material = overrideMaterial;

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.39", "version": "4.2.40",
"unity": "2018.3", "unity": "2018.3",
"author": { "author": {
"name": "Esoteric Software", "name": "Esoteric Software",