diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-22 12:51:29 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-22 12:51:29 -0700 |
| commit | 03cc47698489929b66fbceb139e4c95d13392b9d (patch) | |
| tree | 5eb7cad80837639409e7aa2a9fb222b1ec07862b /indra/llappearance/lltexlayer.cpp | |
| parent | 309ffd57fade231c3d14eedfe1171788e250f088 (diff) | |
| parent | c7057c141c38492bfdc2bfe9d82de97a7364f01b (diff) | |
Merge with 3.6.8
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; |