From 3350d638dd5cd2b8fc5983bafab2aca92746a8cc Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 23 Jul 2015 09:29:27 -0700 Subject: [PATCH] always use the _viewFrustum for caluclating the pick ray, not the _displayViewFrustum which can be the mirror --- interface/src/Application.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8f825a2768..3130e172af 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2963,11 +2963,7 @@ PickRay Application::computePickRay(float x, float y) const { if (isHMDMode()) { getApplicationCompositor().computeHmdPickRay(glm::vec2(x, y), result.origin, result.direction); } else { - if (QThread::currentThread() == activeRenderingThread) { - getDisplayViewFrustum()->computePickRay(x, y, result.origin, result.direction); - } else { - getViewFrustum()->computePickRay(x, y, result.origin, result.direction); - } + getViewFrustum()->computePickRay(x, y, result.origin, result.direction); } return result; }