Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.0.0.234:src/hifi-master into set-model-entity-joints

Browse source
This commit is contained in:
Seth Alves 2016-01-04 14:52:31 -08:00
commit f06ae21da4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -895,7 +895,7 @@ bool EntityScriptingInterface::setAbsoluteJointsDataInObjectFrame(const QUuid& e
});
properties.setJointRotationsDirty();
properties.setLastEdited(now);
// properties.setLastEdited(now);
queueEntityMessage(PacketType::EntityEdit, entityID, properties);
return true;
}
@ -904,11 +904,12 @@ bool EntityScriptingInterface::setAbsoluteJointsDataInObjectFrame(const QUuid& e
for (int index = 0; index < count; index++) {
result |= modelEntity->setAbsoluteJointTranslationInObjectFrame(index, translations[index]);
}
now = usecTimestampNow();
if (result) {
EntityItemProperties properties;
_entityTree->withWriteLock([&] {
properties = entity->getProperties();
entity->setLastEdited(now);
// entity->setLastEdited(now);
entity->setLastBroadcast(now);
});