[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29564] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/sculpt.c: * Bug Fix: Some strangeness with how alpha is handled in textures.

[Jason Wilkins]

Revision: 29564
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29564
Author:   jwilkins
Date:     2010-06-19 13:30:47 +0200 (Sat, 19 Jun 2010)

Log Message:
-----------
* Bug Fix: Some strangeness with how alpha is handled in textures.

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-06-19 10:50:23 UTC (rev 29563)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-06-19 11:30:47 UTC (rev 29564)
@@ -595,7 +595,8 @@
 	TexResult texres;
 	float co[3];
 	int hasrgb;
-	
+	int tmp;
+
 	co[0] = u;
 	co[1] = v;
 	co[2] = 0;
@@ -603,7 +604,8 @@
 	memset(&texres, 0, sizeof(TexResult));
 	hasrgb = multitex_ext(br->mtex.tex, co, NULL, NULL, 1, &texres);
 
-	if (hasrgb & TEX_RGB) texres.tin = (0.35*texres.tr + 0.45*texres.tg + 0.2*texres.tb);
+	if (hasrgb & TEX_RGB)
+		texres.tin = (0.35*texres.tr + 0.45*texres.tg + 0.2*texres.tb)*texres.ta;
 
 	return texres.tin;
 }