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/lldrawpoolmaterials.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/lldrawpoolmaterials.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolmaterials.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp index 08a36bddf1..49619e6b1d 100644 --- a/indra/newview/lldrawpoolmaterials.cpp +++ b/indra/newview/lldrawpoolmaterials.cpp @@ -71,7 +71,15 @@ void LLDrawPoolMaterials::beginDeferredPass(S32 pass) 15, //LLRenderPass::PASS_NORMSPEC_GLOW, }; - mShader = &(gDeferredMaterialProgram[shader_idx[pass]]); + if (LLPipeline::sUnderWaterRender) + { + mShader = &(gDeferredMaterialWaterProgram[shader_idx[pass]]); + } + else + { + mShader = &(gDeferredMaterialProgram[shader_idx[pass]]); + } + mShader->bind(); diffuse_channel = mShader->enableTexture(LLShaderMgr::DIFFUSE_MAP); |