diff --git a/spine-libgdx/src/com/esotericsoftware/spine/AnimationStateData.java b/spine-libgdx/src/com/esotericsoftware/spine/AnimationStateData.java index ba9277820..259c02253 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/AnimationStateData.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/AnimationStateData.java @@ -65,9 +65,7 @@ public class AnimationStateData { public float getMix (Animation from, Animation to) { tempKey.a1 = from; tempKey.a2 = to; - float time = animationToMixTime.get(tempKey, Float.MIN_VALUE); - if (time == Float.MIN_VALUE) return defaultMix; - return time; + return animationToMixTime.get(tempKey, defaultMix); } public float getDefaultMix () { diff --git a/spine-libgdx/src/com/esotericsoftware/spine/Slot.java b/spine-libgdx/src/com/esotericsoftware/spine/Slot.java index 41ac06a97..25856aecc 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/Slot.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/Slot.java @@ -40,7 +40,7 @@ public class Slot { final Color color; Attachment attachment; private float attachmentTime; - private final FloatArray attachmentVertices = new FloatArray(); + private FloatArray attachmentVertices = new FloatArray(); Slot () { data = null; @@ -100,7 +100,7 @@ public class Slot { if (this.attachment == attachment) return; this.attachment = attachment; attachmentTime = skeleton.time; - //attachmentVertices.clear(); + // attachmentVertices.clear(); } public void setAttachmentTime (float time) { @@ -112,6 +112,10 @@ public class Slot { return skeleton.time - attachmentTime; } + public void setAttachmentVertices (FloatArray attachmentVertices) { + this.attachmentVertices = attachmentVertices; + } + public FloatArray getAttachmentVertices () { return attachmentVertices; }