diff options
| author | Scott Lawrence <oz@lindenlab.com> | 2013-10-16 17:26:02 -0400 |
|---|---|---|
| committer | Scott Lawrence <oz@lindenlab.com> | 2013-10-16 17:26:02 -0400 |
| commit | 3986a358db70d6282772c31884fd0fc814e59066 (patch) | |
| tree | 47147145b9574310080a96807bc6e91d6f45d6be /indra/llappearance/lltexlayer.cpp | |
| parent | ba7a564700ba20c6ece7ab16197c2415ebec42cb (diff) | |
| parent | c7057c141c38492bfdc2bfe9d82de97a7364f01b (diff) | |
Merged 3.6.8-release
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 f951a982e5..a3a8616864 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -1123,7 +1123,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; |