diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-10-21 16:57:38 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-10-21 16:57:38 -0600 |
| commit | 0c60e3280866d0d9692b71166c93a2f6cda06f58 (patch) | |
| tree | 5800e31bb4f1012f4e251fb6b70f608eaf46dfbb /indra/llappearance/lltexlayer.cpp | |
| parent | fc45b59a977881a4e37619cb0220790d5ad4c814 (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 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; |