livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Dave Parks 2011-11-17 11:54:06 -06:00
parent 9d1228b538 c902ff338b
commit e4b3198504
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/lldrawpoolterrain.cpp
View File

@ -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
{