From 77b857031b2a0e94f97a860061fa96c32fde84c6 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 31 Aug 2015 11:01:15 -0700 Subject: [PATCH] Take timeScale into account during interps & setCurrentFrame() --- libraries/animation/src/AnimClip.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/animation/src/AnimClip.cpp b/libraries/animation/src/AnimClip.cpp index 4f3ea54e34..c4294495e7 100644 --- a/libraries/animation/src/AnimClip.cpp +++ b/libraries/animation/src/AnimClip.cpp @@ -75,7 +75,7 @@ void AnimClip::loadURL(const std::string& url) { void AnimClip::setCurrentFrameInternal(float frame) { const float dt = 0.0f; - _frame = accumulateTime(frame, dt); + _frame = accumulateTime(frame * _timeScale, dt); } float AnimClip::accumulateTime(float frame, float dt) const {