History

more locking

Seth Alves committed 11 years ago

Commit d72152d1 parent 07a4dc33 files · +8 −5Browse files

Showing the changes to libraries/physics/src/ObjectActionSpring.cpp (1 of 3 files). Show all

Unified · Split

libraries/physics/src/ObjectActionSpring.cpp+1−2
@@ -159,14 +159,13 @@ bool ObjectActionSpring::updateArguments(QVariantMap arguments) { · 158 unmodified lines
159 _rotationalTarget = rotationalTarget;159 _rotationalTarget = rotationalTarget;
160 _angularTimeScale = glm::max(MIN_TIMESCALE, glm::abs(angularTimeScale));160 _angularTimeScale = glm::max(MIN_TIMESCALE, glm::abs(angularTimeScale));
161 _active = true;161 _active = true;
162 activateBody();
163 162
164 auto ownerEntity = _ownerEntity.lock();163 auto ownerEntity = _ownerEntity.lock();
165 if (ownerEntity) {164 if (ownerEntity) {
166 ownerEntity->setActionDataDirty(true);165 ownerEntity->setActionDataDirty(true);
167 }166 }
168
169 });167 });
168 activateBody();
170 }169 }
171 170
172 return true;171 return true;