diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-08-01 14:01:37 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-08-01 14:01:37 -0700 |
| commit | 2d065562f1dabd090a12b75f1aa4233ce9d7ce33 (patch) | |
| tree | 6e51ce065b5026a19c3b9d79e9bee8d1042d119b /indra/newview | |
| parent | 4a3c99beb228680b297e9a3388df3290b594cd57 (diff) | |
NORSPEC-336 fix glow regression from 304 fix
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/lldrawpoolalpha.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index bd8ecdb166..1cc81fa863 100755 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -545,7 +545,10 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) emissive_shader->bind(); - params.mVertexBuffer->setBuffer(mask & LLVertexBuffer::MAP_EMISSIVE); + U32 final_mask = params.mFullbright ? (mask | LLVertexBuffer::MAP_EMISSIVE) + : ((mask & ~LLVertexBuffer::MAP_COLOR) | LLVertexBuffer::MAP_EMISSIVE); + + params.mVertexBuffer->setBuffer(final_mask); // do the actual drawing, again params.mVertexBuffer->drawRange(params.mDrawMode, params.mStart, params.mEnd, params.mCount, params.mOffset); |