History

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

ZappoMan committed 9 years ago

Commit afaad5f2 parents f63db42 667f091122 files · +4064 −1596Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+0−15
@@ -1833,18 +1833,3 @@ bool EntityScriptingInterface::verifyStaticCertificateProperties(const QUuid& en · 1832 unmodified lines
1833 }1833 }
1834 return result;1834 return result;
1835}1835}
1836
1837#ifdef DEBUG_CERT
1838QString EntityScriptingInterface::computeCertificateID(const QUuid& entityID) {
1839 QString result { "" };
1840 if (_entityTree) {
1841 _entityTree->withReadLock([&] {
1842 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID));
1843 if (entity) {
1844 result = entity->computeCertificateID();
1845 }
1846 });
1847 }
1848 return result;
1849}
1850#endif