Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching

ZappoMan committed 11 years ago

Commit 807cc3d2 parents 4bbde3d 08b646614 files · +762 −137Browse files

Showing the changes to interface/src/Application.cpp (1 of 14 files). Show all

Unified · Split

interface/src/Application.cpp+5−2

@@ -3096,8 +3096,11 @@ PickRay Application::computePickRay(float x, float y) const { · 3095 unmodified lines
3096	3096	if (isHMDMode()) {
3097	3097	getApplicationOverlay().computeHmdPickRay(glm::vec2(x, y), result.origin, result.direction);
3098	3098	} else {
3099		− auto frustum = activeRenderingThread ? getDisplayViewFrustum() : getViewFrustum();
3100		− frustum->computePickRay(x, y, result.origin, result.direction);
	3099	+ if (QThread::currentThread() == activeRenderingThread) {
	3100	+ getDisplayViewFrustum()->computePickRay(x, y, result.origin, result.direction);
	3101	+ } else {
	3102	+ getViewFrustum()->computePickRay(x, y, result.origin, result.direction);
	3103	+ }
3101	3104	}
3102	3105	return result;
3103	3106	}