[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34877] trunk/blender: - Do not use old anchor toggling operator.

[Sergey Sharybin]

Revision: 34877
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34877
Author:   nazgul
Date:     2011-02-15 19:19:36 +0000 (Tue, 15 Feb 2011)
Log Message:
-----------
- Do not use old anchor toggling operator. It used to set brush flags to
  unawaliable state.
- Also changed dynamic space bar menu, so it now also wouldn't allow to
  set brush stroke flags to unavaliable state.

Also tried to remove use_anchor, use_space, use_restore_mesh and
use_airbrush, so user would be unable to set flags to unavaliable state,
but it was quite difficult for non-sculpt paint modes. They don't support
all of stroke methods, so brush.stroke_method can't be used for them.

Keep this area unchanged for now.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2011-02-15 19:04:51 UTC (rev 34876)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2011-02-15 19:19:36 UTC (rev 34877)
@@ -1070,11 +1070,8 @@
         sculpt_tool = brush.sculpt_tool
 
         if sculpt_tool != 'GRAB':
-            layout.prop(brush, "use_airbrush")
+            layout.prop_menu_enum(brush, "stroke_method")
 
-            if sculpt_tool != 'LAYER':
-                layout.prop(brush, "use_anchor")
-
             if sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'):
                 layout.prop_menu_enum(brush, "direction")
 

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2011-02-15 19:04:51 UTC (rev 34876)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2011-02-15 19:19:36 UTC (rev 34877)
@@ -338,8 +338,8 @@
 	ed_keymap_paint_brush_size(keymap, "tool_settings.sculpt.brush.size");
 
 	/* */
-	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", AKEY, KM_PRESS, 0, 0);
-	RNA_string_set(kmi->ptr, "data_path", "tool_settings.sculpt.brush.use_anchor");
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_menu_enum", AKEY, KM_PRESS, 0, 0);
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.sculpt.brush.stroke_method");
 
 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", SKEY, KM_PRESS, KM_SHIFT, 0);
 	RNA_string_set(kmi->ptr, "data_path", "tool_settings.sculpt.brush.use_smooth_stroke");