From e3c39020dcd04da661ad87c833d411ce7f5f4327 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Fri, 17 Aug 2018 12:54:47 -0700 Subject: [PATCH] Exit early from CollisionPick::filterIntersections on empty blacklist --- interface/src/raypick/CollisionPick.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interface/src/raypick/CollisionPick.cpp b/interface/src/raypick/CollisionPick.cpp index 59fe6504ca..52650966d3 100644 --- a/interface/src/raypick/CollisionPick.cpp +++ b/interface/src/raypick/CollisionPick.cpp @@ -340,6 +340,11 @@ void CollisionPick::filterIntersections(std::shared_ptr& ignoreItems = getIgnoreItems(); const QVector& includeItems = getIncludeItems(); bool isWhitelist = includeItems.size(); + + if (!isWhitelist && !ignoreItems.size()) { + return; + } + int n = (int)intersections->size(); for (int i = 0; i < n; i++) { auto& intersection = (*intersections)[i];