From 7054188f210a888133a2fedd32de798720f021fd Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Fri, 7 Dec 2018 17:03:14 -0800 Subject: [PATCH] different entity flags for domain/avatar --- libraries/shared/src/PickFilter.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/shared/src/PickFilter.h b/libraries/shared/src/PickFilter.h index 22cf79b238..96fbadf117 100644 --- a/libraries/shared/src/PickFilter.h +++ b/libraries/shared/src/PickFilter.h @@ -67,7 +67,12 @@ public: // Helpers for RayPickManager Flags getEntityFlags() const { - unsigned int toReturn = getBitMask(DOMAIN_ENTITIES) || getBitMask(AVATAR_ENTITIES); + unsigned int toReturn = 0; + for (int i = DOMAIN_ENTITIES; i < LOCAL_ENTITIES; i++) { + if (_flags[i]) { + toReturn |= getBitMask(FlagBit(i)); + } + } for (int i = HUD + 1; i < NUM_FLAGS; i++) { if (_flags[i]) { toReturn |= getBitMask(FlagBit(i));