Skip to content
Snippets Groups Projects
Commit c902ff33 authored by David Parks's avatar David Parks
Browse files

SH-2670 Fix for terrain being wrong detail.

parent e822ecc8
No related branches found
No related tags found
No related merge requests found
...@@ -130,24 +130,9 @@ void LLDrawPoolTerrain::beginRenderPass( S32 pass ) ...@@ -130,24 +130,9 @@ void LLDrawPoolTerrain::beginRenderPass( S32 pass )
LLFastTimer t(FTM_RENDER_TERRAIN); LLFastTimer t(FTM_RENDER_TERRAIN);
LLFacePool::beginRenderPass(pass); LLFacePool::beginRenderPass(pass);
if (sDetailMode > 0) sShader = LLPipeline::sUnderWaterRender ?
{ &gTerrainWaterProgram :
sShader = LLPipeline::sUnderWaterRender ? &gTerrainProgram;
&gTerrainWaterProgram :
&gTerrainProgram;
}
else
{
if (LLPipeline::sUnderWaterRender)
{
sShader = &gObjectSimpleNonIndexedTexGenWaterProgram;
}
else
{
sShader = &gObjectSimpleNonIndexedTexGenProgram;
}
}
if (mVertexShaderLevel > 1 && sShader->mShaderLevel > 0) if (mVertexShaderLevel > 1 && sShader->mShaderLevel > 0)
{ {
...@@ -210,14 +195,7 @@ void LLDrawPoolTerrain::render(S32 pass) ...@@ -210,14 +195,7 @@ void LLDrawPoolTerrain::render(S32 pass)
{ {
gPipeline.enableLightsDynamic(); gPipeline.enableLightsDynamic();
if (sDetailMode > 0) renderFullShader();
{
renderFullShader();
}
else
{
renderSimple();
}
} }
else else
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment