diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-13 17:04:59 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-13 17:04:59 -0800 |
| commit | e9777048751c73819e85257a6e7b0d0608fd6c39 (patch) | |
| tree | c625f4e5c04f0882df16308b38ada6fd4d1e02e4 /indra/newview/lldrawpoolterrain.cpp | |
| parent | 98d6d1969be08f16a5d565b544f46c8a13fb4db5 (diff) | |
| parent | 07d509bce6dc06a7ef8b3a640d622d1ed44ae3cc (diff) | |
Merge
Diffstat (limited to 'indra/newview/lldrawpoolterrain.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index ba2b00ee4e..e676b8d9f9 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -222,7 +222,7 @@ void LLDrawPoolTerrain::beginDeferredPass(S32 pass) LL_RECORD_BLOCK_TIME(FTM_RENDER_TERRAIN); LLFacePool::beginRenderPass(pass); - sShader = &gDeferredTerrainProgram; + sShader = LLPipeline::sUnderWaterRender ? &gDeferredTerrainWaterProgram : &gDeferredTerrainProgram; sShader->bind(); } |