summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-08-07 16:30:27 -0700
committerGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-08-07 16:30:27 -0700
commit79686b6974bb07063f2ff470d4ff0cfd38ac8847 (patch)
treec51867c83ba3461b3b55d65e3f13634340fbd27d /indra/newview
parente156e3ff32469d5efdfd4fb96969b8cc4bc056b8 (diff)
NORSPEC-342 fix alpha objects appearing black in impostor images
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/lldrawpoolalpha.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 8b2cbb1b9d..ba83c95518 100755
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -548,7 +548,8 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
gPipeline.addTrianglesDrawn(params.mCount, params.mDrawMode);
// If this alpha mesh has glow, then draw it a second time to add the destination-alpha (=glow). Interleaving these state-changing calls could be expensive, but glow must be drawn Z-sorted with alpha.
- if (current_shader &&
+ if (current_shader &&
+ !LLPipeline::sImpostorRender &&
draw_glow_for_this_partition &&
params.mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE))
{