Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

lkalif · lkalif · commit 1bd78c539800 · 2013-11-14T02:51:36.000+01:00
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass)`
`598`	`598`	`// 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.`
`599`	`599`	`if (current_shader &&`
`600`	`600`	`draw_glow_for_this_partition &&`
`601`		`- params.mHasGlow && //only do this second pass for batches that actually have glow`
	`601`	`+ (!is_particle_or_hud_particle \|\| params.mHasGlow) && //only do this second pass for batches that actually have glow`
`602`	`602`	`params.mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE))`
`603`	`603`	`{`
`604`	`604`	`// install glow-accumulating blend mode`