diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-10-16 17:56:48 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-10-16 17:56:48 -0400 |
| commit | cecad67163f3607680e70507ec6a5b1a0e98b2c8 (patch) | |
| tree | 5e567da2892c6f6da37957651cf5555685288abc /indra/llappearance/lltexlayer.cpp | |
| parent | 1f8b37e9ad65f8064b83adac295d9eb162976e4c (diff) | |
| parent | c7057c141c38492bfdc2bfe9d82de97a7364f01b (diff) | |
merge
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 510d8ce879..37d9c36918 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; |