[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56989] trunk/blender/source/blender/ editors/sculpt_paint/paint_image_proj.c: Follow up to previous commit.

[Antony Riakiotakis]

Revision: 56989
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56989
Author:   psy-fi
Date:     2013-05-23 21:37:18 +0000 (Thu, 23 May 2013)
Log Message:
-----------
Follow up to previous commit. Non tiled mask wouldn't work on airbrushes

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

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c	2013-05-23 21:24:56 UTC (rev 56988)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c	2013-05-23 21:37:18 UTC (rev 56989)
@@ -3863,6 +3863,11 @@
 						}
 						else {
 							mask *= brush_alpha;
+							if (ps->is_maskbrush) {
+								float texmask = BKE_brush_sample_masktex(ps->scene, ps->brush, projPixel->projCoSS, thread_index, pool);
+								CLAMP(texmask, 0.0, 1.0);
+								mask *= texmask;
+							}
 						}
 
 						if (ps->is_texbrush) {