mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-06 18:56:54 +08:00
Merge branch '4.1' into 4.2
This commit is contained in:
commit
9904398400
@ -239,6 +239,7 @@ namespace Spine.Unity {
|
|||||||
Initialize(false);
|
Initialize(false);
|
||||||
if (meshRenderer)
|
if (meshRenderer)
|
||||||
meshRenderer.enabled = false;
|
meshRenderer.enabled = false;
|
||||||
|
updateMode = UpdateMode.FullUpdate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
remove {
|
remove {
|
||||||
@ -405,7 +406,8 @@ namespace Spine.Unity {
|
|||||||
|
|
||||||
public virtual void Awake () {
|
public virtual void Awake () {
|
||||||
Initialize(false);
|
Initialize(false);
|
||||||
updateMode = updateWhenInvisible;
|
if (generateMeshOverride == null || !disableRenderingOnOverride)
|
||||||
|
updateMode = updateWhenInvisible;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if UNITY_EDITOR && CONFIGURABLE_ENTER_PLAY_MODE
|
#if UNITY_EDITOR && CONFIGURABLE_ENTER_PLAY_MODE
|
||||||
|
|||||||
@ -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.62",
|
"version": "4.2.63",
|
||||||
"unity": "2018.3",
|
"unity": "2018.3",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Esoteric Software",
|
"name": "Esoteric Software",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user