History

Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023

Brad Hefta-Gaub committed 9 years ago

Commit 18a74ce2 parents bcad230 1f6d98916 files · +215 −196Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−2
@@ -461,7 +461,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 460 unmodified lines
461461 // if they've changed.
462462 entity->forEachDescendant([&](SpatiallyNestablePointer descendant) {
463463 if (descendant->getNestableType() == NestableType::Entity) {
464− if (descendant->checkAndMaybeUpdateQueryAACube()) {
464+ if (descendant->updateQueryAACube()) {
465465 EntityItemPointer entityDescendant = std::static_pointer_cast<EntityItem>(descendant);
466466 EntityItemProperties newQueryCubeProperties;
467467 newQueryCubeProperties.setQueryAACube(descendant->getQueryAACube());
@@ -1843,4 +1843,4 @@ QString EntityScriptingInterface::computeCertificateID(const QUuid& entityID) { · 1375 unmodified lines
18431843 }
18441844 return result;
18451845 }
1846−#endif
1846+#endif