summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolsky.cpp
diff options
context:
space:
mode:
authorGraham Madarasz (Graham) <graham@lindenlab.com>2013-07-11 16:21:23 -0700
committerGraham Madarasz (Graham) <graham@lindenlab.com>2013-07-11 16:21:23 -0700
commitfbf3d8b78137a5229ccfabd1e42a0712d92b061f (patch)
tree54be4abc8d7ca079be78f65d9f9b39a0da54d009 /indra/newview/lldrawpoolsky.cpp
parentd7856f09999206be489183f52ae2f33020a68538 (diff)
NORSPEC-291 WIP materials underwater with haze, reflection broken, water dist broken
Diffstat (limited to 'indra/newview/lldrawpoolsky.cpp')
-rwxr-xr-xindra/newview/lldrawpoolsky.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp
index d36b9ace94..ef8bdc3304 100755
--- a/indra/newview/lldrawpoolsky.cpp
+++ b/indra/newview/lldrawpoolsky.cpp
@@ -77,7 +77,7 @@ void LLDrawPoolSky::render(S32 pass)
}
// don't render sky under water (background just gets cleared to fog color)
- if(mVertexShaderLevel > 0 /*&& !LLPipeline::sRenderDeferred*/ && LLPipeline::sUnderWaterRender)
+ if(mVertexShaderLevel > 0 && LLPipeline::sUnderWaterRender)
{
return;
}
@@ -155,3 +155,4 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side)
void LLDrawPoolSky::endRenderPass( S32 pass )
{
}
+