From a78728c96b0f447f9a13e74df3ae6101c8096d2e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 15 Oct 2015 10:29:25 -0700 Subject: [PATCH] further unmangle branch split --- interface/src/avatar/AvatarActionHold.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp index 51394798ab..4288a354f5 100644 --- a/interface/src/avatar/AvatarActionHold.cpp +++ b/interface/src/avatar/AvatarActionHold.cpp @@ -60,9 +60,11 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) { if (gotLock) { gotLock = withTryWriteLock([&]{ - _positionalTarget = position; - _rotationalTarget = rotation; - }); + _positionalTarget = position; + _rotationalTarget = rotation; + _positionalTargetSet = true; + _rotationalTargetSet = true; + }); } if (gotLock) { ObjectActionSpring::updateActionWorker(deltaTimeStep);