diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-07-10 09:47:46 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-07-10 09:47:46 -0700 |
| commit | 326e20b0e5cd8e30d4b52c662a29aa2fc816b40d (patch) | |
| tree | f9c766719839a8948ac4ff3463a420525169ee1b /indra/newview/lldrawpoolwlsky.cpp | |
| parent | 167fc262734dfb72e33e57a0b309d0ce6a17ce47 (diff) | |
NORSPEC-291 WIP materials underwater w and wo alpha, water fog color broken, no refl, no water dis
Diffstat (limited to 'indra/newview/lldrawpoolwlsky.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolwlsky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index b5faff7968..56b58aaeb4 100755 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -99,12 +99,12 @@ LLViewerTexture *LLDrawPoolWLSky::getDebugTexture() void LLDrawPoolWLSky::beginRenderPass( S32 pass ) { sky_shader = - LLPipeline::sUnderWaterRender ? + (LLPipeline::sUnderWaterRender /*&& !LLPipeline::sRenderDeferred*/) ? &gObjectFullbrightNoColorWaterProgram : &gWLSkyProgram; cloud_shader = - LLPipeline::sUnderWaterRender ? + (LLPipeline::sUnderWaterRender /*&& !LLPipeline::sRenderDeferred*/) ? &gObjectFullbrightNoColorWaterProgram : &gWLCloudProgram; } |