From f5f1a64c92b9a0a8a92bd0a3e07c196a831874c6 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 25 Sep 2017 17:38:56 -0700 Subject: [PATCH] use const ref on pointer, and use dynamic_cast --- libraries/entities/src/EntityTree.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 6cf3b51001..6769af45a3 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -113,7 +113,7 @@ void EntityTree::readBitstreamToTree(const unsigned char* bitstream, // add entities QHash::const_iterator itr; for (itr = _entitiesToAdd.constBegin(); itr != _entitiesToAdd.constEnd(); ++itr) { - EntityItemPointer entityItem = itr.value(); + EntityItemPointer& entityItem = itr.value(); AddEntityOperator theOperator(getThisPointer(), entityItem); recurseTreeWithOperator(&theOperator); postAddEntity(entityItem); @@ -560,7 +560,7 @@ void EntityTree::deleteEntity(const EntityItemID& entityID, bool force, bool ign auto descendantID = descendant->getID(); theOperator.addEntityIDToDeleteList(descendantID); emit deletingEntity(descendantID); - EntityItemPointer descendantEntity = std::static_pointer_cast(descendant); + EntityItemPointer descendantEntity = std::dynamic_pointer_cast(descendant); if (descendantEntity) { emit deletingEntityPointer(descendantEntity.get()); }