Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 21:15:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

further unmangle branch split

Browse source
This commit is contained in:
Seth Alves 2015-10-15 10:29:25 -07:00
parent e571cb7ca4
commit a78728c96b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/avatar/AvatarActionHold.cpp
View file

@ -60,9 +60,11 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
if (gotLock) { if (gotLock) {
gotLock = withTryWriteLock([&]{ gotLock = withTryWriteLock([&]{
_positionalTarget = position; _positionalTarget = position;
_rotationalTarget = rotation; _rotationalTarget = rotation;
}); _positionalTargetSet = true;
_rotationalTargetSet = true;
});
} }
if (gotLock) { if (gotLock) {
ObjectActionSpring::updateActionWorker(deltaTimeStep); ObjectActionSpring::updateActionWorker(deltaTimeStep);