Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +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:33:58 -07:00
parent a78728c96b
commit 64c5cde2d2
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,10 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
_rotationalTarget = rotation;
_positionalTargetSet = true;
_rotationalTargetSet = true;
auto ownerEntity = _ownerEntity.lock();
if (ownerEntity) {
ownerEntity->setActionDataDirty(true);
}
});
}
if (gotLock) {

1
libraries/physics/src/ObjectActionSpring.cpp
View file

@ -219,6 +219,7 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) {
uint16_t serializationVersion;
dataStream >> serializationVersion;
if (serializationVersion != ObjectActionSpring::springVersion) {
assert(false);
return;
}