|
@@ -731,11 +731,11 @@ function AnimationState:addAnimation (trackIndex, animation, loop, delay)
|
|
if last.loop then
|
|
if last.loop then
|
|
delay = delay + duration * (1 + math_floor(last.trackTime / duration))
|
|
delay = delay + duration * (1 + math_floor(last.trackTime / duration))
|
|
else
|
|
else
|
|
- delay = delay + duration
|
|
|
|
|
|
+ delay = delay + math_max(duration, last.trackTime)
|
|
end
|
|
end
|
|
delay = delay - data:getMix(last.animation, animation)
|
|
delay = delay - data:getMix(last.animation, animation)
|
|
else
|
|
else
|
|
- delay = 0
|
|
|
|
|
|
+ delay = last.trackTime
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|