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

This commit is contained in:
Seth Alves 2016-01-04 15:03:36 -08:00
commit 10f5682a3e

View file

@ -890,7 +890,7 @@ bool EntityScriptingInterface::setAbsoluteJointsDataInObjectFrame(const QUuid& e
EntityItemProperties properties;
_entityTree->withWriteLock([&] {
properties = entity->getProperties();
entity->setLastEdited(now);
// entity->setLastEdited(now);
entity->setLastBroadcast(now);
});
@ -909,7 +909,7 @@ bool EntityScriptingInterface::setAbsoluteJointsDataInObjectFrame(const QUuid& e
EntityItemProperties properties;
_entityTree->withWriteLock([&] {
properties = entity->getProperties();
entity->setLastEdited(now);
// entity->setLastEdited(now);
entity->setLastBroadcast(now);
});