diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-13 23:58:44 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-13 23:58:44 +0000 |
| commit | 07d509bce6dc06a7ef8b3a640d622d1ed44ae3cc (patch) | |
| tree | 1d3f6df6406cd8b4a0472ccd24224e3d6dc12325 /indra/newview/lldrawpoolterrain.cpp | |
| parent | 5d9915243ba1a93934969e7e203a25c6f4c9f9d1 (diff) | |
| parent | 65927e0a76aaf8ff4dc268acdb12007265ff3a14 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #276)
SL-10181, SL-10546
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(); } |