summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-03-01 16:04:25 -0600
committerDave Parks <davep@lindenlab.com>2011-03-01 16:04:25 -0600
commitfcb205131ccc02b2b50e79ad274ed4ef4fec0330 (patch)
tree9d4cedf86f20df5abbf137e4ae46fb7dc679f04c /indra/newview
parent5eeca73940bb083e76cb73d1528e61544d3f7fd2 (diff)
SH-1068 Disable DoF when underwater (shader doesn't have enough information to execute).
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/pipeline.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 55d73f9808..b29e32f1d8 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6160,7 +6160,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
LLVertexBuffer::unbind();
- if (LLPipeline::sRenderDeferred)
+ if (LLPipeline::sRenderDeferred && !LLViewerCamera::getInstance()->cameraUnderWater())
{
LLGLSLShader* shader = &gDeferredPostProgram;
if (LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_DEFERRED) > 2)