From 8d4d57310424640fd64068280508504eeec9a266 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Sun, 26 Mar 2017 17:24:21 +0900 Subject: [PATCH] Javadoc --- .../com/esotericsoftware/spine/AnimationState.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java index 9b46e90db..b44188a95 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -703,13 +703,13 @@ public class AnimationState { this.timeScale = timeScale; } - /** When false, only two animations can be mixed at once. Interrupting a mix by setting a new animation will choose from the - * two old animations the one that is closest to being fully mixed in and the other is discarded. Discarding an animation in - * this way may cause keyed values to jump. + /** When false, only two animations can be mixed at once. Interrupting a mix by setting a new animation will discard one of the + * two old animations, keeping the one closest to being fully mixed in. Discarding an animation in this way may cause keyed + * values to jump. *

- * When true, any number of animations may be mixed at once without causing keyed values to jump. Mixing is done by mixing out - * one or more animations while mixing in the newest one. When animations key the same value, this may cause "dipping", where - * the value moves toward the setup pose as the old animation mixes out, then back to the keyed value as the new animation + * When true, any number of animations can be mixed at once without causing keyed values to jump. Mixing is done by mixing out + * one or more old animations while mixing in the newest one. When animations key the same value, this may cause "dipping", + * where the value moves toward the setup pose as the old animations mix out, then back to the keyed value as the new animation * mixes in. *

* Defaults to false. */