diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-11 17:10:26 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-11 17:10:26 -0500 |
| commit | 8746648c4ea43aff03854bab2a5739fbbbe24ea7 (patch) | |
| tree | bdeddf3800805f6d83998d2a92e2e6f5c37279b3 | |
| parent | 44f0a1b68118f662e68904eea83a3801b4577070 (diff) | |
Fix for under water render going black when deferred rendering and anti-aliasing enabled.
| -rw-r--r-- | indra/newview/pipeline.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index ba948bf139..e74bf2a620 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6257,9 +6257,9 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) LLVertexBuffer::unbind(); - if (LLPipeline::sRenderDeferred && !LLViewerCamera::getInstance()->cameraUnderWater()) + if (LLPipeline::sRenderDeferred) { - bool dof_enabled = true; + bool dof_enabled = !LLViewerCamera::getInstance()->cameraUnderWater(); LLGLSLShader* shader = &gDeferredPostProgram; if (LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_DEFERRED) > 2) @@ -6267,7 +6267,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) shader = &gDeferredGIFinalProgram; dof_enabled = false; } - else if (LLToolMgr::getInstance()->inBuildMode() || !gSavedSettings.getBOOL("RenderDepthOfField")) + else if (!dof_enabled || LLToolMgr::getInstance()->inBuildMode() || !gSavedSettings.getBOOL("RenderDepthOfField")) { //squish focal length when in build mode (or if DoF is disabled) so DoF doesn't make editing objects difficult shader = &gDeferredPostNoDoFProgram; dof_enabled = false; |