diff options
| author | Scott Lawrence <oz@lindenlab.com> | 2013-10-16 17:24:32 -0400 |
|---|---|---|
| committer | Scott Lawrence <oz@lindenlab.com> | 2013-10-16 17:24:32 -0400 |
| commit | 7ba4fc06f351dc09bf3cac6cc768a11302ce5598 (patch) | |
| tree | 256001700bd19cead3e198727ecf6ce80c7ac998 /indra/llappearance | |
| parent | 9c313aea13c70db145d3f2ba840fdc34ed8c8adf (diff) | |
| parent | c7057c141c38492bfdc2bfe9d82de97a7364f01b (diff) | |
Merged 3.6.8-release
Diffstat (limited to 'indra/llappearance')
| -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; |