From 6081d63f5317cc0bab726029dde9b727d4a7bfb1 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Fri, 17 Aug 2018 13:17:35 -0700 Subject: [PATCH] Use std::vector::insert for merging CollisionPickResults --- interface/src/raypick/CollisionPick.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/interface/src/raypick/CollisionPick.cpp b/interface/src/raypick/CollisionPick.cpp index 52650966d3..a7ee534528 100644 --- a/interface/src/raypick/CollisionPick.cpp +++ b/interface/src/raypick/CollisionPick.cpp @@ -20,17 +20,13 @@ PickResultPointer CollisionPickResult::compareAndProcessNewResult(const PickResu const std::shared_ptr newCollisionResult = std::static_pointer_cast(newRes); if (entityIntersections->size()) { - for (ContactTestResult& entityIntersection : *(newCollisionResult->entityIntersections)) { - entityIntersections->push_back(entityIntersection); - } + entityIntersections->insert(entityIntersections->cend(), newCollisionResult->entityIntersections->begin(), newCollisionResult->entityIntersections->end()); } else { entityIntersections = newCollisionResult->entityIntersections; } if (avatarIntersections->size()) { - for (ContactTestResult& avatarIntersection : *(newCollisionResult->avatarIntersections)) { - avatarIntersections->push_back(avatarIntersection); - } + avatarIntersections->insert(avatarIntersections->cend(), newCollisionResult->avatarIntersections->begin(), newCollisionResult->avatarIntersections->end()); } else { avatarIntersections = newCollisionResult->avatarIntersections; }