From 51940898d9a7027a1b20e6fcb4bf78ac3d654b73 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Fri, 17 Aug 2018 16:23:31 -0700 Subject: [PATCH] Do not implicitly convert size of vector to bool in CollisionPick::filterIntersections --- interface/src/raypick/CollisionPick.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/raypick/CollisionPick.cpp b/interface/src/raypick/CollisionPick.cpp index a7ee534528..01264a252d 100644 --- a/interface/src/raypick/CollisionPick.cpp +++ b/interface/src/raypick/CollisionPick.cpp @@ -335,9 +335,9 @@ CollisionRegion CollisionPick::getMathematicalPick() const { void CollisionPick::filterIntersections(std::shared_ptr> intersections) const { const QVector& ignoreItems = getIgnoreItems(); const QVector& includeItems = getIncludeItems(); - bool isWhitelist = includeItems.size(); + bool isWhitelist = !includeItems.empty(); - if (!isWhitelist && !ignoreItems.size()) { + if (!isWhitelist && ignoreItems.empty()) { return; }