History

Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup

ZappoMan committed 8 years ago

Commit 04ee1ad2 parents 74ceab1 e070033312 files · +9601 −3391Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 312 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+1−1
@@ -1827,7 +1827,7 @@ bool EntityScriptingInterface::verifyStaticCertificateProperties(const QUuid& en · 1826 unmodified lines
1827 _entityTree->withReadLock([&] {1827 _entityTree->withReadLock([&] {
1828 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID));1828 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID));
1829 if (entity) {1829 if (entity) {
1830 result = entity->verifyStaticCertificateProperties();1830 result = entity->getProperties().verifyStaticCertificateProperties();
1831 }1831 }
1832 });1832 });
1833 }1833 }