Merge branch 'master' of https://github.com/highfidelity/hifi into daft

samcake committed 11 years ago

Commit 9c744dc2 parents 5557dc4 542a5f150 files · +951 −272Browse files

Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 50 files). Show all

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+1−1

@@ -119,7 +119,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend · 118 unmodified lines
119	args->_viewFrustum->evalProjectionMatrix(projMat);	119	args->_viewFrustum->evalProjectionMatrix(projMat);
120	args->_viewFrustum->evalViewTransform(viewMat);	120	args->_viewFrustum->evalViewTransform(viewMat);
121	if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {	121	if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
122	viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));	122	viewMat.preScale(glm::vec3(-1.0f, 1.0f, 1.0f));
123	}	123	}
124	batch.setProjectionTransform(projMat);	124	batch.setProjectionTransform(projMat);
125	batch.setViewTransform(viewMat);	125	batch.setViewTransform(viewMat);