diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
| commit | c93c38e047836e31dd34e33391a997d883777ae1 (patch) | |
| tree | ccb52c02f9a3bfeb76254e128abc250e7fd5a962 /indra/newview/lldrawpoolalpha.cpp | |
| parent | fceae96eb171be0396512e251aab311d4e3ef9cc (diff) | |
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 5cb914c37e..93af956466 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -271,12 +271,20 @@ void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask { gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); light_enabled = FALSE; + if (LLPipeline::sRenderGlow) + { + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + } } } else if (!light_enabled) { gPipeline.enableLightsDynamic(1.f); light_enabled = TRUE; + if (LLPipeline::sRenderGlow) + { + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); + } } /*if (params.mParticle) @@ -309,6 +317,11 @@ void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask if (!light_enabled) { gPipeline.enableLightsDynamic(1.f); + + if (LLPipeline::sRenderGlow) + { + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); + } } /*glPointSize(1.f); |