From 162cbeec72208a418ef37e2a9e3bc956e84ce08e Mon Sep 17 00:00:00 2001 From: Stephen Gowen Date: Tue, 16 Jan 2018 09:50:31 -0500 Subject: [PATCH] Porting over recent change from AnimationState.c to AnimationState.cpp --- spine-cpp/spine-cpp/src/spine/AnimationState.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp index f11649d6b..9d0140b82 100644 --- a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp +++ b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp @@ -568,9 +568,13 @@ namespace Spine { if (delay <= 0) { float duration = last->_animationEnd - last->_animationStart; if (duration != 0) { - delay += duration * (1 + (int)(last->_trackTime / duration)) - _data.getMix(last->_animation, animation); - } - else { + if (last->_loop) { + delay += duration * (1 + (int)(last->_trackTime / duration)); + } else { + delay += duration; + } + delay -= _data.getMix(last->_animation, animation); + } else { delay = 0; } }