summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-08-01 10:34:36 -0700
committerGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-08-01 10:34:36 -0700
commit4a3c99beb228680b297e9a3388df3290b594cd57 (patch)
treec3080a576254ce0b2a2059e0915c4c5c3a3b66de /indra/newview
parent42ce98e8bfe3fd633e15f703d5ffdad64c2965a5 (diff)
NORSPEC-304 fix glow pass rendering over alpha pass after ALM toggle
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/lldrawpoolalpha.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index f4f63e1042..bd8ecdb166 100755
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -545,8 +545,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
emissive_shader->bind();
- // glow doesn't use vertex colors from the mesh data
- params.mVertexBuffer->setBuffer((mask & ~LLVertexBuffer::MAP_COLOR) | LLVertexBuffer::MAP_EMISSIVE);
+ params.mVertexBuffer->setBuffer(mask & LLVertexBuffer::MAP_EMISSIVE);
// do the actual drawing, again
params.mVertexBuffer->drawRange(params.mDrawMode, params.mStart, params.mEnd, params.mCount, params.mOffset);