diff options
| author | JJ Linden <jj@lindenlab.com> | 2013-09-30 15:41:51 -0700 |
|---|---|---|
| committer | JJ Linden <jj@lindenlab.com> | 2013-09-30 15:41:51 -0700 |
| commit | a6c20ae524610de2f8681cff8353d062a69b923e (patch) | |
| tree | 929e4a253e4b83ca7e07543916e709d50fdf855e /indra/newview/lldrawpoolwater.cpp | |
| parent | 6c13c4dd552a05cf055a90bdd90937de9f3903a5 (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
merging
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 { |