[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27301] trunk/blender/source/blender/ editors/sculpt_paint/paint_image.c: masking wast used for reprojectuion ( used for stencil & normal falloff)

[Campbell Barton]

Revision: 27301
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27301
Author:   campbellbarton
Date:     2010-03-06 23:53:31 +0100 (Sat, 06 Mar 2010)

Log Message:
-----------
masking wast used for  reprojectuion (used for stencil & normal falloff)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_image.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2010-03-06 22:30:09 UTC (rev 27300)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2010-03-06 22:53:31 UTC (rev 27301)
@@ -3738,8 +3738,10 @@
 				projPixel = (ProjPixel *)node->link;
 
 				bicubic_interpolation_color(ps->reproject_ibuf, projPixel->newColor.ch, NULL, projPixel->projCoSS[0], projPixel->projCoSS[1]);
-				if(projPixel->newColor.ch[3])
+				if(projPixel->newColor.ch[3]) {
+					mask = ((float)projPixel->mask)/65535.0f;
 					blend_color_mix_rgb(projPixel->pixel.ch_pt,  projPixel->origColor.ch, projPixel->newColor.ch, (mask*projPixel->newColor.ch[3]));
+				}
 			}
 		}
 		else {