Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Browse files Browse the repository at this point in the history
  • Loading branch information
lkalif committed Nov 14, 2013
2 parents 8ad3b87 + fc4f0ea commit 1bd78c5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion indra/newview/lldrawpoolalpha.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass)
// 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.mHasGlow && //only do this second pass for batches that actually have glow
(!is_particle_or_hud_particle || params.mHasGlow) && //only do this second pass for batches that actually have glow
params.mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE))
{
// install glow-accumulating blend mode
Expand Down

0 comments on commit 1bd78c5

Please sign in to comment.