more locking

This commit is contained in:
Seth Alves 2015-10-14 13:01:56 -07:00
parent 07a4dc3a7f
commit d72152da87
3 changed files with 8 additions and 5 deletions

View file

@ -136,15 +136,14 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) {
_angularTimeScale = _linearTimeScale;
_hand = hand;
_holderID = holderID;
_active = true;
activateBody();
auto ownerEntity = _ownerEntity.lock();
if (ownerEntity) {
ownerEntity->setActionDataDirty(true);
}
});
activateBody();
}
return true;

View file

@ -126,8 +126,13 @@ bool ObjectActionOffset::updateArguments(QVariantMap arguments) {
_linearDistance = linearDistance;
_positionalTargetSet = true;
_active = true;
activateBody();
auto ownerEntity = _ownerEntity.lock();
if (ownerEntity) {
ownerEntity->setActionDataDirty(true);
}
});
activateBody();
}
return true;

View file

@ -159,14 +159,13 @@ bool ObjectActionSpring::updateArguments(QVariantMap arguments) {
_rotationalTarget = rotationalTarget;
_angularTimeScale = glm::max(MIN_TIMESCALE, glm::abs(angularTimeScale));
_active = true;
activateBody();
auto ownerEntity = _ownerEntity.lock();
if (ownerEntity) {
ownerEntity->setActionDataDirty(true);
}
});
activateBody();
}
return true;