diff options
author | Graham Linden <graham@lindenlab.com> | 2013-07-12 13:01:31 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2013-07-12 13:01:31 -0700 |
commit | 5efee00a835a30f09637b2459134d458a9efa6cd (patch) | |
tree | da53774d9b3b9256d5da00635b4e04505d0ff404 /indra/newview/lldrawpoolwater.cpp | |
parent | b588865f3f56a338fc068b55ab1a408f89307f2b (diff) |
NORSPEC-291 WIP added underwater deferred program and more reflection pass work
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
-rwxr-xr-x | indra/newview/lldrawpoolwater.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 5b0b173926..6774926f62 100755 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -524,7 +524,14 @@ void LLDrawPoolWater::shade() if (eyedepth < 0.f && LLPipeline::sWaterReflections) { - shader = &gUnderWaterProgram; + if (deferred_render) + { + shader = &gDeferredUnderWaterProgram; + } + else + { + shader = &gUnderWaterProgram; + } } else if (deferred_render) { |