[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26003] trunk/blender/source/blender/ editors/sculpt_paint: Mkey toggles mask while in vertex/texture/ weight paint mode.

Campbell Barton ideasman42 at gmail.com
Thu Jan 14 19:11:10 CET 2010


Revision: 26003
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26003
Author:   campbellbarton
Date:     2010-01-14 19:11:10 +0100 (Thu, 14 Jan 2010)

Log Message:
-----------
Mkey toggles mask while in vertex/texture/weight paint mode.
remove unused operator property

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

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2010-01-14 16:14:24 UTC (rev 26002)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2010-01-14 18:11:10 UTC (rev 26003)
@@ -276,6 +276,9 @@
 	ed_keymap_paint_brush_switch(keymap, "tool_settings.vertex_paint.active_brush_index");
 	ed_keymap_paint_brush_size(keymap, "tool_settings.vertex_paint.brush.size");
 
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", MKEY, KM_PRESS, 0, 0); /* mask toggle */
+	RNA_string_set(kmi->ptr, "path", "vertex_paint_object.data.use_paint_mask");
+
 	/* Weight Paint mode */
 	keymap= WM_keymap_find(keyconf, "Weight Paint", 0, 0);
 	keymap->poll= weight_paint_poll;
@@ -291,6 +294,9 @@
 	ed_keymap_paint_brush_switch(keymap, "tool_settings.weight_paint.active_brush_index");
 	ed_keymap_paint_brush_size(keymap, "tool_settings.weight_paint.brush.size");
 
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", MKEY, KM_PRESS, 0, 0); /* mask toggle */
+	RNA_string_set(kmi->ptr, "path", "weight_paint_object.data.use_paint_mask");
+
 	/* Image/Texture Paint mode */
 	keymap= WM_keymap_find(keyconf, "Image Paint", 0, 0);
 	keymap->poll= image_texture_paint_poll;
@@ -305,6 +311,9 @@
 	ed_keymap_paint_brush_switch(keymap, "tool_settings.image_paint.active_brush_index");
 	ed_keymap_paint_brush_size(keymap, "tool_settings.image_paint.brush.size");
 
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", MKEY, KM_PRESS, 0, 0); /* mask toggle */
+	RNA_string_set(kmi->ptr, "path", "texture_paint_object.data.use_paint_mask");
+
 	/* face-mask mode */
 	keymap= WM_keymap_find(keyconf, "Face Mask", 0, 0);
 	keymap->poll= facemask_paint_poll;

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2010-01-14 16:14:24 UTC (rev 26002)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2010-01-14 18:11:10 UTC (rev 26003)
@@ -1700,8 +1700,6 @@
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-
-	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first.");
 }
 
 /* ************ set / clear vertex paint mode ********** */





More information about the Bf-blender-cvs mailing list