Revision: 57752
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57752
Author: campbellbarton
Date: 2013-06-26 02:57:05 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
fix for vert/face mask modes using last used select option when using the
select-all key shortcut.
Modified Paths:
--------------
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
2013-06-26 02:47:56 UTC (rev 57751)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
2013-06-26 02:57:05 UTC (rev 57752)
@@ -1242,7 +1242,8 @@
/*Weight paint's Vertex Selection Mode */
keymap = WM_keymap_find(keyconf, "Weight Paint Vertex Selection", 0, 0);
keymap->poll = vert_paint_poll;
- WM_keymap_add_item(keymap, "PAINT_OT_vert_select_all", AKEY, KM_PRESS,
0, 0);
+ kmi = WM_keymap_add_item(keymap, "PAINT_OT_vert_select_all", AKEY,
KM_PRESS, 0, 0);
+ RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
kmi = WM_keymap_add_item(keymap, "PAINT_OT_vert_select_all", IKEY,
KM_PRESS, KM_CTRL, 0);
RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
WM_keymap_add_item(keymap, "VIEW3D_OT_select_border", BKEY, KM_PRESS,
0, 0);
@@ -1283,7 +1284,8 @@
keymap = WM_keymap_find(keyconf, "Face Mask", 0, 0);
keymap->poll = facemask_paint_poll;
- WM_keymap_add_item(keymap, "PAINT_OT_face_select_all", AKEY, KM_PRESS,
0, 0);
+ kmi = WM_keymap_add_item(keymap, "PAINT_OT_face_select_all", AKEY,
KM_PRESS, 0, 0);
+ RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
kmi = WM_keymap_add_item(keymap, "PAINT_OT_face_select_all", IKEY,
KM_PRESS, KM_CTRL, 0);
RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
kmi = WM_keymap_add_item(keymap, "PAINT_OT_face_select_hide", HKEY,
KM_PRESS, 0, 0);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
2013-06-26 02:47:56 UTC (rev 57751)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
2013-06-26 02:57:05 UTC (rev 57752)
@@ -914,7 +914,7 @@
but = uiDefButO_ptr(block, BUT, ot, WM_OP_EXEC_DEFAULT,
"Normalize",
0, yco, UI_UNIT_X * 5, UI_UNIT_Y,
TIP_("Normalize weights of active vertex
(if affected groups are unlocked"));
- if(locked) {
+ if (locked) {
uiButSetFlag(but, UI_BUT_DISABLED);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
