From 281b71300d0296f54809948d16c778b6bf08ef19 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 20 Oct 2011 15:14:51 -0500 Subject: SH-2521 Force terrain to render as simple when GL version < 2.0 --- indra/newview/lldrawpoolterrain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index e14d0c5f9d..ce601325c8 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -196,7 +196,7 @@ void LLDrawPoolTerrain::render(S32 pass) return; } // Render simplified land if video card can't do sufficient multitexturing - if (!gGLManager.mHasARBEnvCombine || (gGLManager.mNumTextureUnits < 2)) + if (!LLGLSLShader::sNoFixedFunction || !gGLManager.mHasARBEnvCombine || (gGLManager.mNumTextureUnits < 2)) { renderSimple(); // Render without multitexture return; -- cgit v1.2.3