[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48202] branches/soc-2012-bratwurst/source /blender: Texture masks

[Antony Riakiotakis]

Revision: 48202
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48202
Author:   psy-fi
Date:     2012-06-22 16:53:34 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Texture masks
==============
Mask support for image editor

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c

Modified: branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c	2012-06-22 16:16:58 UTC (rev 48201)
+++ branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c	2012-06-22 16:53:34 UTC (rev 48202)
@@ -623,6 +623,7 @@
 				xy[0] = x + xoff;
 				xy[1] = y + yoff;
 
+				/* texfall = 0, 1 seem unused from a qiock search */
 				if (texfall == 0) {
 					copy_v3_v3(dstf, brush_rgb);
 					dstf[3] = alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
@@ -633,7 +634,8 @@
 				else {
 					BKE_brush_sample_tex(scene, brush, xy, rgba, 0, angle);
 					mul_v3_v3v3(dstf, rgba, brush_rgb);
-					dstf[3] = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
+					dstf[3] = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius)
+					        *BKE_brush_sample_masktex(scene, brush, xy, 0, angle);
 				}
 			}
 		}
@@ -664,7 +666,8 @@
 				else if (texfall == 2) {
 					BKE_brush_sample_tex(scene, brush, xy, rgba, 0, angle);
 					mul_v3_v3(rgba, brush->rgb);
-					alpha_f = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
+					alpha_f = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius)
+					        *BKE_brush_sample_masktex(scene, brush, xy, 0, angle);
 
 					rgb_float_to_uchar(dst, rgba);
 
@@ -672,7 +675,8 @@
 				}
 				else {
 					BKE_brush_sample_tex(scene, brush, xy, rgba, 0, angle);
-					alpha_f = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
+					alpha_f = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius)
+					        *BKE_brush_sample_masktex(scene, brush, xy, 0, angle);
 
 					dst[0] = crgb[0];
 					dst[1] = crgb[1];

Modified: branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c	2012-06-22 16:16:58 UTC (rev 48201)
+++ branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c	2012-06-22 16:53:34 UTC (rev 48202)
@@ -5563,7 +5563,7 @@
 	return NULL;
 }
 
-int ui_handle_button_event(bContext *C, wmEvent *event, uiBut *but);
+static int ui_handle_button_event(bContext *C, wmEvent *event, uiBut *but);
 
 static int ui_handle_button_over(bContext *C, wmEvent *event, ARegion *ar)
 {