diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
| commit | 73f474d886d2430db3d5c8f7729f769b389730a4 (patch) | |
| tree | 5b1f481284a030c72ac08d8b3027ed608bc3ceb6 /indra/newview/lldrawpoolalpha.cpp | |
| parent | 81ffd3fccac709a5903dd0d7572db50c50850347 (diff) | |
| parent | 180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff) | |
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/lldrawpoolalpha.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 6fa16825df..331744acb7 100644..100755 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -515,7 +515,8 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) // 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 && draw_glow_for_this_partition && - params.mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE)) + params.mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE) && + (!params.mParticle || params.mHasGlow)) { static LLFastTimer::DeclareTimer FTM_RENDER_ALPHA_GLOW("Alpha Glow"); LLFastTimer t(FTM_RENDER_ALPHA_GLOW); |