UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-09 16:48:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2018-01-12 11:20:38 +01:00
commit 32229b17c2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
View File

@ -167,8 +167,8 @@ public class Animation {
* value is set. */
setup,
/** Transitions from the current value to the timeline value. Before the first key, transitions from the current value to
* the setup value, except for timelines which perform instant transitions, such as {@link DrawOrderTimeline} or
* {@link AttachmentTimeline}.
* the setup value. Timelines which perform instant transitions, such as {@link DrawOrderTimeline} or
* {@link AttachmentTimeline}, use the setup value before the first key.
* <p>
* <code>first</code> is intended for the first animations applied, not for animations layered on top of those. */
first,
@ -1274,7 +1274,7 @@ public class Animation {
float[] frames = this.frames;
if (time < frames[0]) { // Time is before first frame.
if (blend == setup) System.arraycopy(slots.items, 0, drawOrder.items, 0, slots.size);
if (blend == setup || blend == first) System.arraycopy(slots.items, 0, drawOrder.items, 0, slots.size);
return;
}