diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-17 11:54:06 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-17 11:54:06 -0600 |
| commit | e4b3198504158724c429152b18bc52bda5b74bfd (patch) | |
| tree | 6c0d2a96a8fda16a4f91964fb27aa6b7829e5b15 /indra/newview | |
| parent | 9d1228b5388ce4c39be8a9f156634bd63a608cf2 (diff) | |
| parent | c902ff338b85d244bd0a1a972c9d0eed35668c44 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index b8e653c5de..b95d8296fa 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -130,24 +130,9 @@ void LLDrawPoolTerrain::beginRenderPass( S32 pass ) LLFastTimer t(FTM_RENDER_TERRAIN); LLFacePool::beginRenderPass(pass); - if (sDetailMode > 0) - { - sShader = LLPipeline::sUnderWaterRender ? - &gTerrainWaterProgram : - &gTerrainProgram; - } - else - { - if (LLPipeline::sUnderWaterRender) - { - sShader = &gObjectSimpleNonIndexedTexGenWaterProgram; - } - else - { - sShader = &gObjectSimpleNonIndexedTexGenProgram; - } - } - + sShader = LLPipeline::sUnderWaterRender ? + &gTerrainWaterProgram : + &gTerrainProgram; if (mVertexShaderLevel > 1 && sShader->mShaderLevel > 0) { @@ -210,14 +195,7 @@ void LLDrawPoolTerrain::render(S32 pass) { gPipeline.enableLightsDynamic(); - if (sDetailMode > 0) - { - renderFullShader(); - } - else - { - renderSimple(); - } + renderFullShader(); } else { |