always use the _viewFrustum for caluclating the pick ray, not the _displayViewFrustum which can be the mirror

This commit is contained in:
ZappoMan 2015-07-23 09:29:27 -07:00
parent 0ec5dea532
commit 3350d638dd

View file

@ -2962,13 +2962,9 @@ PickRay Application::computePickRay(float x, float y) const {
PickRay result; PickRay result;
if (isHMDMode()) { if (isHMDMode()) {
getApplicationCompositor().computeHmdPickRay(glm::vec2(x, y), result.origin, result.direction); getApplicationCompositor().computeHmdPickRay(glm::vec2(x, y), result.origin, result.direction);
} else {
if (QThread::currentThread() == activeRenderingThread) {
getDisplayViewFrustum()->computePickRay(x, y, result.origin, result.direction);
} else { } else {
getViewFrustum()->computePickRay(x, y, result.origin, result.direction); getViewFrustum()->computePickRay(x, y, result.origin, result.direction);
} }
}
return result; return result;
} }