From 55c98fc7f11dc0fc0da7ffea4851c34020ef95b7 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sun, 27 Apr 2014 22:02:17 +0200 Subject: [PATCH] Fix AnimationState to use previous.timeScale when mixing. --- spine-c/src/spine/AnimationState.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spine-c/src/spine/AnimationState.c b/spine-c/src/spine/AnimationState.c index 81ca8461e..04931c8bf 100644 --- a/spine-c/src/spine/AnimationState.c +++ b/spine-c/src/spine/AnimationState.c @@ -87,17 +87,17 @@ void spAnimationState_dispose (spAnimationState* self) { void spAnimationState_update (spAnimationState* self, float delta) { int i; - float trackDelta; + float previousDelta; delta *= self->timeScale; for (i = 0; i < self->trackCount; i++) { spTrackEntry* current = self->tracks[i]; if (!current) continue; - trackDelta = delta * current->timeScale; - current->time += trackDelta; + current->time += delta * current->timeScale; if (current->previous) { - current->previous->time += trackDelta; - current->mixTime += trackDelta; + previousDelta = delta * current->previous->timeScale; + current->previous->time += previousDelta; + current->mixTime += previousDelta; } if (current->next) {