diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-09-18 15:58:54 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-09-18 15:58:54 -0700 |
| commit | d9ad2d3a13b4bb15ab5e56fd04970abc03e100e7 (patch) | |
| tree | 39178dd2b0ab11d754b57b492b4835b926a538c6 /indra/newview/lldrawpoolwater.cpp | |
| parent | c8144f7405178621f779b814fd4cb3e632786e0a (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Merge with 3.6.6-release
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolwater.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 5ddc15df42..6774926f62 100755 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -522,13 +522,20 @@ void LLDrawPoolWater::shade() F32 eyedepth = LLViewerCamera::getInstance()->getOrigin().mV[2] - gAgent.getRegion()->getWaterHeight(); - if (deferred_render) + if (eyedepth < 0.f && LLPipeline::sWaterReflections) { - shader = &gDeferredWaterProgram; + if (deferred_render) + { + shader = &gDeferredUnderWaterProgram; + } + else + { + shader = &gUnderWaterProgram; + } } - else if (eyedepth < 0.f && LLPipeline::sWaterReflections) + else if (deferred_render) { - shader = &gUnderWaterProgram; + shader = &gDeferredWaterProgram; } else { |