[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55684] trunk/blender: UI cleanup:

[Antony Riakiotakis]

Revision: 55684
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55684
Author:   psy-fi
Date:     2013-03-31 11:04:13 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
UI cleanup:

* Using masking is determined only by the presence of the texture,
remove extraneous DNA flag (might cause issues later but in practice
brush options are not harmful)
* Overlay and angle sliders are active during stencil mapped brushes
* Only draw the overlay if there's a texture.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_image.py
    trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
    trunk/blender/source/blender/makesdna/DNA_brush_types.h
    trunk/blender/source/blender/makesrna/intern/rna_brush.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_image.py	2013-03-31 10:33:27 UTC (rev 55683)
+++ trunk/blender/release/scripts/startup/bl_ui/space_image.py	2013-03-31 11:04:13 UTC (rev 55684)
@@ -739,11 +739,6 @@
     bl_label = "Texture Mask"
     bl_options = {'DEFAULT_CLOSED'}
 
-    def draw_header(self, context):
-        brush = context.tool_settings.image_paint.brush
-        tex_slot_alpha = brush.mask_texture_slot
-        self.layout.prop(brush, 'use_mask', text="")
-
     def draw(self, context):
         layout = self.layout
 

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-03-31 10:33:27 UTC (rev 55683)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-03-31 11:04:13 UTC (rev 55684)
@@ -779,11 +779,6 @@
         brush = context.tool_settings.image_paint.brush
         return (context.image_paint_object and brush and brush.image_tool != 'SOFTEN')
 
-    def draw_header(self, context):
-        brush = context.tool_settings.image_paint.brush
-        tex_slot_alpha = brush.mask_texture_slot
-        self.layout.prop(brush, 'use_mask', text="")
-
     def draw(self, context):
         layout = self.layout
 

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c	2013-03-31 10:33:27 UTC (rev 55683)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c	2013-03-31 11:04:13 UTC (rev 55684)
@@ -424,9 +424,9 @@
 	bool col;
 	/* check for overlay mode */
 
-	if (brush->mtex.brush_map_mode != MTEX_MAP_MODE_STENCIL &&
-	    (!(brush->flag & BRUSH_TEXTURE_OVERLAY) ||
-	    !ELEM(brush->mtex.brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED)))
+	if (!((brush->mtex.brush_map_mode == MTEX_MAP_MODE_STENCIL && brush->mtex.tex) ||
+	    ((brush->flag & BRUSH_TEXTURE_OVERLAY) &&
+	    ELEM(brush->mtex.brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED))))
 	{
 		return;
 	}

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c	2013-03-31 10:33:27 UTC (rev 55683)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c	2013-03-31 11:04:13 UTC (rev 55684)
@@ -4160,7 +4160,7 @@
 		/* disable for 3d mapping also because painting on mirrored mesh can create "stripes" */
 		ps->do_masking = (brush->flag & BRUSH_AIRBRUSH || brush->mtex.brush_map_mode != MTEX_MAP_MODE_TILED) ? false : true;
 		ps->is_texbrush = (brush->mtex.tex && brush->imagepaint_tool == PAINT_TOOL_DRAW) ? true : false;
-		ps->is_maskbrush = (brush->flag & BRUSH_USE_MASK && brush->mask_mtex.tex) ? true : false;
+		ps->is_maskbrush = (brush->mask_mtex.tex) ? true : false;
 	}
 	else {
 		/* brush may be NULL*/

Modified: trunk/blender/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_brush_types.h	2013-03-31 10:33:27 UTC (rev 55683)
+++ trunk/blender/source/blender/makesdna/DNA_brush_types.h	2013-03-31 11:04:13 UTC (rev 55684)
@@ -144,8 +144,7 @@
 	/* temporary flag which sets up automatically for correct brush
 	 * drawing when inverted modal operator is running */
 	BRUSH_INVERTED = (1 << 29),
-	BRUSH_ABSOLUTE_JITTER = (1 << 30),
-	BRUSH_USE_MASK = (1 << 31)
+	BRUSH_ABSOLUTE_JITTER = (1 << 30)
 } BrushFlags;
 
 /* Brush.sculpt_tool */

Modified: trunk/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_brush.c	2013-03-31 10:33:27 UTC (rev 55683)
+++ trunk/blender/source/blender/makesrna/intern/rna_brush.c	2013-03-31 11:04:13 UTC (rev 55684)
@@ -145,9 +145,10 @@
 static int rna_BrushCapabilities_has_overlay_get(PointerRNA *ptr)
 {
 	Brush *br = (Brush *)ptr->data;
-	return ELEM(br->mtex.brush_map_mode,
+	return ELEM3(br->mtex.brush_map_mode,
 	            MTEX_MAP_MODE_VIEW,
-	            MTEX_MAP_MODE_TILED);
+	            MTEX_MAP_MODE_TILED,
+	            MTEX_MAP_MODE_STENCIL);
 }
 
 static int rna_SculptToolCapabilities_has_persistence_get(PointerRNA *ptr)
@@ -237,10 +238,11 @@
 static int rna_BrushCapabilities_has_texture_angle_get(PointerRNA *ptr)
 {
 	Brush *br = (Brush *)ptr->data;
-	return ELEM3(br->mtex.brush_map_mode,
+	return ELEM4(br->mtex.brush_map_mode,
 	             MTEX_MAP_MODE_VIEW,
 	             MTEX_MAP_MODE_AREA,
-	             MTEX_MAP_MODE_TILED);
+	             MTEX_MAP_MODE_TILED,
+	             MTEX_MAP_MODE_STENCIL);
 }
 
 static int rna_BrushCapabilities_has_texture_angle_source_get(PointerRNA *ptr)
@@ -929,11 +931,6 @@
 	RNA_def_property_ui_text(prop, "Restore Mesh", "Allow a single dot to be carefully positioned");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
 
-	prop = RNA_def_property(srna, "use_mask", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_USE_MASK);
-	RNA_def_property_ui_text(prop, "Mask Texture", "Use a texture as mask for the brush");
-	RNA_def_property_update(prop, 0, "rna_Brush_update");
-	
 	/* only for projection paint, TODO, other paint modes */
 	prop = RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", BRUSH_LOCK_ALPHA);