further unmangle branch split

This commit is contained in:
Seth Alves 2015-10-15 10:29:25 -07:00
parent e571cb7ca4
commit a78728c96b

View file

@ -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);