From 315baeae1f690bfedffa75f9bdc1ab8e721de1ce Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Tue, 17 Oct 2017 13:22:40 -0700 Subject: [PATCH] threading fix --- libraries/pointers/src/pointers/rays/RayPick.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libraries/pointers/src/pointers/rays/RayPick.cpp b/libraries/pointers/src/pointers/rays/RayPick.cpp index 36756cdb79..bc3a05cd7a 100644 --- a/libraries/pointers/src/pointers/rays/RayPick.cpp +++ b/libraries/pointers/src/pointers/rays/RayPick.cpp @@ -32,8 +32,10 @@ float RayPick::getMaxDistance() const { return _maxDistance; } -bool RayPick::isEnabled() const { - return _enabled; +bool RayPick::isEnabled() const { + return resultWithReadLock([&] { + return _enabled; + }); } void RayPick::setPrecisionPicking(bool precisionPicking) { @@ -49,11 +51,15 @@ void RayPick::setRayPickResult(const RayPickResult& rayPickResult) { } QVector RayPick::getIgnoreItems() const { - return _ignoreItems; + return resultWithReadLock>([&] { + return _ignoreItems; + }); } QVector RayPick::getIncludeItems() const { - return _includeItems; + return resultWithReadLock>([&] { + return _includeItems; + }); } RayPickResult RayPick::getPrevRayPickResult() const {