[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19576] trunk/blender/source/blender/ render/intern/source/renderdatabase.c: bugfix #18196

[Ton Roosendaal]

Revision: 19576
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19576
Author:   ton
Date:     2009-04-07 09:46:58 +0200 (Tue, 07 Apr 2009)

Log Message:
-----------
bugfix #18196

Halos for objects (not particles) can get texture color, but they skipped
the alpha mapt-to channel when that was set. Actually bug from ehh 1995!

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	2009-04-07 06:23:45 UTC (rev 19575)
+++ trunk/blender/source/blender/render/intern/source/renderdatabase.c	2009-04-07 07:46:58 UTC (rev 19576)
@@ -1032,9 +1032,11 @@
 				har->g= (yn*tg+ zn*ma->g);
 				har->b= (yn*tb+ zn*ma->b);
 			}
-			if(mtex->texco & 16) {
+			if(mtex->texco & TEXCO_UV) {
 				har->alfa= tin;
 			}
+			if(mtex->mapto & MAP_ALPHA)
+				har->alfa= tin;
 		}
 	}