Revision: 17037
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17037
Author: broken
Date: 2008-10-12 08:39:47 +0200 (Sun, 12 Oct 2008)
Log Message:
-----------
* Patch #17729 from Dalai Felinto
Additional sculpt mode hotkeys to toggle Smooth stroke (Shift S) and Anchored
brush (Shift A) . Menus are updated with hotkeys too. This is a real last
minute one, but it was given the ok previously, and I've just had time to
commit this for him.
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/header_view3d.c
trunk/blender/source/blender/src/space.c
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2008-10-12 00:59:58 UTC
(rev 17036)
+++ trunk/blender/source/blender/src/buttons_editing.c 2008-10-12 06:39:47 UTC
(rev 17037)
@@ -5706,7 +5706,7 @@
if(sd->brush_type == DRAW_BRUSH)
uiDefButC(block,NUM,B_NOP, "View", cx,cy,80,19,
&sculptmode_brush()->view, 0,10,20,0,"Pulls brush direction towards view");
cy-= 20;
- uiDefButBitC(block, TOG, SCULPT_BRUSH_ANCHORED, B_NOP, "Anchored",
cx,cy,80,19, &sculptmode_brush()->flag, 0,0,0,0, "Keep the brush center
anchored to the initial location");
+ uiDefButBitC(block, TOG, SCULPT_BRUSH_ANCHORED, B_NOP, "Anchored",
cx,cy,80,19, &sculptmode_brush()->flag, 0,0,0,0, "Keep the brush center
anchored to the initial location (Shift A)");
uiBlockEndAlign(block);
/* Draw curve */
Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c 2008-10-12 00:59:58 UTC
(rev 17036)
+++ trunk/blender/source/blender/src/header_view3d.c 2008-10-12 06:39:47 UTC
(rev 17037)
@@ -4740,7 +4740,7 @@
block= uiNewBlock(&curarea->uiblocks, "view3d_sculpt_inputmenu",
UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
uiBlockSetButmFunc(block, do_view3d_sculpt_inputmenu, NULL);
- uiDefIconTextBut(block, BUTM, 1, ((sd->flags & SCULPT_INPUT_SMOOTH) ?
ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT), "Smooth Stroke", 0, yco-=20,
menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
+ uiDefIconTextBut(block, BUTM, 1, ((sd->flags & SCULPT_INPUT_SMOOTH) ?
ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT), "Smooth Stroke|Shift S", 0, yco-=20,
menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Tablet Size Adjust", 0,
yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Tablet Strength Adjust",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c 2008-10-12 00:59:58 UTC (rev
17036)
+++ trunk/blender/source/blender/src/space.c 2008-10-12 06:39:47 UTC (rev
17037)
@@ -1523,7 +1523,10 @@
break;
/* Brush properties */
case AKEY:
- br->flag ^= SCULPT_BRUSH_AIRBRUSH;
+ if(G.qual==LR_SHIFTKEY)
+ br->flag ^= SCULPT_BRUSH_ANCHORED;
+ else
+ br->flag ^= SCULPT_BRUSH_AIRBRUSH;
update_prop= 1; break;
case FKEY:
if(ss) {
@@ -1541,8 +1544,13 @@
sd->brush_type= DRAW_BRUSH;
update_prop= 1; break;
case SKEY:
- sd->brush_type= SMOOTH_BRUSH;
- update_prop= 1; break;
+ if(G.qual==LR_SHIFTKEY)
+ sd->flags ^= SCULPT_INPUT_SMOOTH;
+ else {
+ sd->brush_type= SMOOTH_BRUSH;
+ update_prop= 1;
+ }
+ break;
case PKEY:
sd->brush_type= PINCH_BRUSH;
update_prop= 1; break;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
