diff options
| author | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-21 04:21:00 +0100 |
|---|---|---|
| committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-21 04:21:00 +0100 |
| commit | 30f835809bc736351f0134dfefefbdcdcbdc9948 (patch) | |
| tree | 39f20a7defa9de67d1e604bd527f55a37e48f52b /indra/llappearance/lltexlayer.cpp | |
| parent | 79645e6981a97224024c5226d8713dce9569d54a (diff) | |
| parent | 37b705c96264ed28896d687e565d1112939e9123 (diff) | |
Merge 3.5.8-release
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; |