diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-15 16:38:31 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-15 16:38:31 -0500 |
| commit | 24ae2fb5af52d7128e79a0f63afce9a8db1123eb (patch) | |
| tree | 97d944e8dbe700e946f4e35b08ebeb407aaabe6b /indra/newview/llviewerwindow.cpp | |
| parent | f72a24bf3a5bf7ecb826ef5e6d7f17dbb92d5db2 (diff) | |
SH-2243 work in progress -- don't use built-in GL light state when shaders are available.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 010bcfb125..cd9dc461d5 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1725,7 +1725,10 @@ void LLViewerWindow::initGLDefaults() // lights for objects glShadeModel( GL_SMOOTH ); - glLightModelfv(GL_LIGHT_MODEL_AMBIENT, ambient); + if (!LLGLSLShader::sNoFixedFunction) + { + glLightModelfv(GL_LIGHT_MODEL_AMBIENT, ambient); + } gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT); |