From b375205c1a5f7b63745eaafeec792bbd6b84d32e Mon Sep 17 00:00:00 2001 From: GPayne Date: Thu, 5 Sep 2019 12:42:01 -0600 Subject: [PATCH] Undo on recently-added changes that restricted time manipulation during playback. --- src/util/timemanager.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp index 430e4035b5..3a03fd3cc0 100644 --- a/src/util/timemanager.cpp +++ b/src/util/timemanager.cpp @@ -103,10 +103,6 @@ TimeManager::TimeManager() } void TimeManager::interpolateTime(double targetTime, double durationSeconds) { - if (_playbackModeEnabled) { - return; - } - ghoul_precondition(durationSeconds > 0.f, "durationSeconds must be positive"); const double now = global::windowDelegate.applicationTime(); @@ -279,7 +275,7 @@ void TimeManager::progressTime(double dt) { // and time is not paused, just advance time. _deltaTime = _targetDeltaTime; _currentTime.data().advanceTime(dt * _deltaTime); - } + } if (hasPastKeyframes) { _latestConsumedTimestamp = lastPastKeyframe->timestamp; @@ -527,7 +523,7 @@ double TimeManager::targetDeltaTime() const { void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolationDuration) { - if (newDeltaTime == _targetDeltaTime || _playbackModeEnabled) { + if (newDeltaTime == _targetDeltaTime) { return; }