UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 09:46:02 +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-05-12 18:20:15 +02:00
commit 12076b1f75
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spine-unity/Assets/Spine Examples/Scripts/Sample Components/RenderExistingMesh.cs
View File

@ -101,10 +101,15 @@ namespace Spine.Unity.Examples {
} }
#if UNITY_EDITOR #if UNITY_EDITOR
// handle disabled scene reload
private void OnEnable () {
if (Application.isPlaying)
Awake();
}
private void Update () { private void Update () {
if (!Application.isPlaying) { if (!Application.isPlaying)
InitializeDict(); InitializeDict();
}
} }
#endif #endif
@ -142,6 +147,7 @@ namespace Spine.Unity.Examples {
} }
void InitializeDict () { void InitializeDict () {
replacementMaterialDict.Clear();
for (int i = 0; i < replacementMaterials.Length; ++i) { for (int i = 0; i < replacementMaterials.Length; ++i) {
MaterialReplacement entry = replacementMaterials[i]; MaterialReplacement entry = replacementMaterials[i];
replacementMaterialDict[entry.originalMaterial] = entry.replacementMaterial; replacementMaterialDict[entry.originalMaterial] = entry.replacementMaterial;

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

@ -2,7 +2,7 @@
"name": "com.esotericsoftware.spine.spine-unity-examples", "name": "com.esotericsoftware.spine.spine-unity-examples",
"displayName": "spine-unity Runtime Examples", "displayName": "spine-unity Runtime Examples",
"description": "This plugin provides example scenes and scripts for the spine-unity runtime.", "description": "This plugin provides example scenes and scripts for the spine-unity runtime.",
"version": "4.2.0", "version": "4.2.10",
"unity": "2018.3", "unity": "2018.3",
"author": { "author": {
"name": "Esoteric Software", "name": "Esoteric Software",