Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 18:10:37 +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 15:03:36 -08:00
commit 10f5682a3e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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