From 4ab730866929121115b08e47bda96ff3c1c73012 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Mon, 14 Jan 2019 14:04:01 -0800 Subject: [PATCH] addressing code review requests --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 4 ++-- libraries/entities/src/EntityTree.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 8656a000e4..c71b296a74 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -203,7 +203,7 @@ void EntityTreeRenderer::stopNonLocalEntityScripts() { if (_entitiesScriptEngine) { QList entitiesWithEntityScripts = _entitiesScriptEngine->getListOfEntityScriptIDs(); - foreach (EntityItemID entityID, entitiesWithEntityScripts) { + foreach (const EntityItemID& entityID, entitiesWithEntityScripts) { EntityItemPointer entityItem = getTree()->findEntityByEntityItemID(entityID); if (entityItem) { @@ -664,7 +664,7 @@ bool EntityTreeRenderer::checkEnterLeaveEntities() { void EntityTreeRenderer::leaveNonLocalEntities() { if (_tree && !_shuttingDown) { QVector currentLocalEntitiesInside; - foreach (EntityItemID entityID, _currentEntitiesInside) { + foreach (const EntityItemID& entityID, _currentEntitiesInside) { EntityItemPointer entityItem = getTree()->findEntityByEntityItemID(entityID); if (!entityItem->isLocalEntity()) { emit leaveEntity(entityID); diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index a2515519eb..b8babc60b8 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -74,6 +74,8 @@ void EntityTree::eraseNonLocalEntities() { emit clearingEntities(); if (_simulation) { + // This will clear all entities host types including local entities, because local entities + // are not in the physics simulation _simulation->clearEntities(); } _staleProxies.clear();