diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-05-31 21:25:03 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-05-31 21:25:03 +0000 |
| commit | b27aa056a0dca761edfa2f58c8ddfee7de8f8f04 (patch) | |
| tree | 875823cd2e1ec8ccefff6bff17c6737dba06eb52 /indra/newview/lldrawpoolsimple.cpp | |
| parent | 4d5c0fe3efa3bc60b114623180d8830125115359 (diff) | |
| parent | 58f7b981bdb415311f23dfffc39e7a841b3017a0 (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #410)
SL-11337, SL-11221, SL-11339
Diffstat (limited to 'indra/newview/lldrawpoolsimple.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolsimple.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp index f653920662..f211cf6e27 100644 --- a/indra/newview/lldrawpoolsimple.cpp +++ b/indra/newview/lldrawpoolsimple.cpp @@ -447,7 +447,7 @@ void LLDrawPoolFullbrightAlphaMask::render(S32 pass) else { LLGLEnable test(GL_ALPHA_TEST); - gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); + gPipeline.enableLightsFullbright(); pushMaskBatches(LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, getVertexDataMask(), TRUE, FALSE); gPipeline.enableLightsDynamic(); gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); //OK @@ -750,7 +750,7 @@ void LLDrawPoolFullbright::render(S32 pass) } else { - gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); + gPipeline.enableLightsFullbright(); U32 fullbright_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_COLOR; renderTexture(LLRenderPass::PASS_FULLBRIGHT, fullbright_mask); pushBatches(LLRenderPass::PASS_MATERIAL_ALPHA_EMISSIVE, fullbright_mask); |