diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-10-16 15:02:29 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-10-16 15:02:29 -0700 |
| commit | a19f4ae2b31b6bdea1e2f0b6e7f9c420a93596df (patch) | |
| tree | 6463336db2d1e41eb3b34c38ac693278cde0b462 /indra/llappearance | |
| parent | db18ad3b2a368986b2757aab673c3b988cd60575 (diff) | |
| parent | c7057c141c38492bfdc2bfe9d82de97a7364f01b (diff) | |
Merge 3.6.8
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; |