mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-25 21:35:04 +02:00
further unmangle branch split
This commit is contained in:
parent
e571cb7ca4
commit
a78728c96b
1 changed files with 5 additions and 3 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue