[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28750] branches/render25/source/blender/ render/intern/source/rendercore.c: Render Branch: Fix problem rendering lamp halo's with some materials

[Brecht Van Lommel]

Revision: 28750
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28750
Author:   blendix
Date:     2010-05-13 18:19:34 +0200 (Thu, 13 May 2010)

Log Message:
-----------
Render Branch: Fix problem rendering lamp halo's with some materials
using lightgroups.

Modified Paths:
--------------
    branches/render25/source/blender/render/intern/source/rendercore.c

Modified: branches/render25/source/blender/render/intern/source/rendercore.c
===================================================================
--- branches/render25/source/blender/render/intern/source/rendercore.c	2010-05-13 15:30:50 UTC (rev 28749)
+++ branches/render25/source/blender/render/intern/source/rendercore.c	2010-05-13 16:19:34 UTC (rev 28750)
@@ -648,7 +648,7 @@
 	int a, mask= 0;
 
 	for(a=0; a<tot; a++)
-		if(samp_shr[a].z == PASS_Z_MAX)
+		if(samp_shr[a].combined[3] < 1.0f)
 			mask |= (1<<a);
 	
 	/* do lamp halo for pixel samples that were not filled in yet, others were
@@ -662,13 +662,14 @@
 		memset(&shi->primitive, 0, sizeof(shi->primitive));
 		camera_raster_to_view(&re->cam, shi->geometry.view, x, y);
 		camera_raster_to_co(&re->cam, shi->geometry.co, x, y, 0x7FFFFFFF);
+		shi->material.mat= NULL;
 		
 		zero_v4(col);
 		lamp_spothalo_render(re, shi, col, 1.0f);
 
 		for(a=0; a<tot; a++)
-			if(samp_shr[a].z == PASS_Z_MAX)
-				copy_v4_v4(samp_shr[a].combined, col);
+			if(samp_shr[a].combined[3] < 1.0f)
+				pxf_add_alpha_under(samp_shr[a].combined, col);
 	}
 }