diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-10-22 16:08:16 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-10-22 16:08:16 -0600 |
| commit | 4264060662c1a598856622a749ea4a3216c5975c (patch) | |
| tree | 20d7c778219425205aa23e5020b39dbe58904f44 /indra/llappearance/lltexlayer.cpp | |
| parent | f4283778dd581801459c262d05b9f5d107505a7c (diff) | |
| parent | e0ace6d8690b2f60fb9b359f4840081957a3ff25 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llappearance/lltexlayer.cpp')
| -rw-r--r-- | indra/llappearance/lltexlayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index a634186df0..fb1ea93060 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -1124,7 +1124,10 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height) // *TODO: Is this correct? //gPipeline.disableLights(); stop_glerror(); - glDisable(GL_LIGHTING); + if (!LLGLSLShader::sNoFixedFunction) + { + glDisable(GL_LIGHTING); + } stop_glerror(); bool use_shaders = LLGLSLShader::sNoFixedFunction; |