[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33538] trunk/blender/source/blender/ render/intern/source/renderdatabase.c: Bug fix: Halos didn' t use texture alpha

[Janne Karhu]

Revision: 33538
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33538
Author:   jhk
Date:     2010-12-07 13:29:51 +0100 (Tue, 07 Dec 2010)

Log Message:
-----------
Bug fix: Halos didn't use texture alpha

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/renderdatabase.c

Modified: trunk/blender/source/blender/render/intern/source/renderdatabase.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/renderdatabase.c	2010-12-07 12:17:23 UTC (rev 33537)
+++ trunk/blender/source/blender/render/intern/source/renderdatabase.c	2010-12-07 12:29:51 UTC (rev 33538)
@@ -1048,7 +1048,7 @@
 	MTex *mtex;
 	float tin, tr, tg, tb, ta;
 	float xn, yn, zn, texvec[3], hoco[4], hoco1[4], in[3],tex[3],out[3];
-	int i;
+	int i, hasrgb;
 
 	if(hasize==0.0) return NULL;
 
@@ -1151,7 +1151,7 @@
 				VECCOPY(texvec, orco);
 			}
 
-			externtex(mtex, texvec, &tin, &tr, &tg, &tb, &ta, 0);
+			hasrgb = externtex(mtex, texvec, &tin, &tr, &tg, &tb, &ta, 0);
 
 			//yn= tin*mtex->colfac;
 			//zn= tin*mtex->alphafac;
@@ -1172,6 +1172,11 @@
 				har->g= in[1];
 				har->b= in[2];
 			}
+
+			/* alpha returned, so let's use it instead of intensity */
+			if(hasrgb)
+				tin = ta;
+
 			if(mtex->mapto & MAP_ALPHA)
 				har->alfa = texture_value_blend(mtex->def_var,har->alfa,tin,mtex->alphafac,mtex->blendtype);
 			if(mtex->mapto & MAP_HAR)