summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-15 16:38:31 -0500
committerDave Parks <davep@lindenlab.com>2011-09-15 16:38:31 -0500
commit24ae2fb5af52d7128e79a0f63afce9a8db1123eb (patch)
tree97d944e8dbe700e946f4e35b08ebeb407aaabe6b /indra/newview/llviewerdisplay.cpp
parentf72a24bf3a5bf7ecb826ef5e6d7f17dbb92d5db2 (diff)
SH-2243 work in progress -- don't use built-in GL light state when shaders are available.
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r--indra/newview/llviewerdisplay.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 5f4156732e..22f4db56dd 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -522,10 +522,13 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
// Slam lighting parameters back to our defaults.
// Note that these are not the same as GL defaults...
- stop_glerror();
- F32 one[4] = {1.f, 1.f, 1.f, 1.f};
- glLightModelfv (GL_LIGHT_MODEL_AMBIENT,one);
- stop_glerror();
+ if (!LLGLSLShader::sNoFixedFunction)
+ {
+ stop_glerror();
+ F32 one[4] = {1.f, 1.f, 1.f, 1.f};
+ glLightModelfv (GL_LIGHT_MODEL_AMBIENT,one);
+ stop_glerror();
+ }
/////////////////////////////////////
//