diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-08-02 16:36:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-08-02 16:36:50 -0400 |
| commit | 5e8995220304a105d821eb3bccd8be484520174a (patch) | |
| tree | 9b4ba9044ba7f98a38865fc854914e6b9e248486 /indra/newview/lldrawpoolalpha.cpp | |
| parent | c339894390af70b32cef3fca258b9a19ce4aeb20 (diff) | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) | |
merge changes for 5.1.7-release
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index b0d48abb14..0873300cd2 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -328,6 +328,9 @@ void LLDrawPoolAlpha::render(S32 pass) gGL.diffuseColor4f(0, 0, 1, 1); pushBatches(LLRenderPass::PASS_MATERIAL_ALPHA_MASK, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); + gGL.diffuseColor4f(0, 1, 0, 1); + pushBatches(LLRenderPass::PASS_INVISIBLE, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); + if(shaders) { gHighlightProgram.unbind(); |