davep avatar davep committed 46b90ad Merge

merge

Comments (0)

Files changed (1)

indra/newview/lldrawpoolterrain.cpp

 	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)
 	{
 	{
 		gPipeline.enableLightsDynamic();
 
-		if (sDetailMode > 0)
-		{
-			renderFullShader();
-		}
-		else
-		{
-			renderSimple();
-		}
+		renderFullShader();
 	}
 	else
 	{
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.