From b9f14ea56b5e2b7c42b63bc71986bb55f1e7b910 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 27 Feb 2014 09:39:04 +0200 Subject: Fix T36654. There is a key conflict between grease pencil shortcuts and sculpt shortcuts (D and ctrl D were taken by draw brush and dyntopo toggle, respectively). Based on feedback, change dyntopo toggle to ctrl-T and draw brush to X. Also add missing property update for dyntopo detail size. --- source/blender/editors/sculpt_paint/paint_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index ce57b12d0ba..920647158a7 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -1152,7 +1152,7 @@ void ED_keymap_paint(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "PAINT_OT_mask_lasso_gesture", LEFTMOUSE, KM_PRESS, KM_CTRL | KM_SHIFT, 0); /* Toggle dynamic topology */ - WM_keymap_add_item(keymap, "SCULPT_OT_dynamic_topology_toggle", DKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "SCULPT_OT_dynamic_topology_toggle", TKEY, KM_PRESS, KM_CTRL, 0); /* Dynamic-topology detail size * @@ -1177,7 +1177,7 @@ void ED_keymap_paint(wmKeyConfig *keyconf) ed_keymap_stencil(keymap); - keymap_brush_select(keymap, OB_MODE_SCULPT, SCULPT_TOOL_DRAW, DKEY, 0); + keymap_brush_select(keymap, OB_MODE_SCULPT, SCULPT_TOOL_DRAW, XKEY, 0); keymap_brush_select(keymap, OB_MODE_SCULPT, SCULPT_TOOL_SMOOTH, SKEY, 0); keymap_brush_select(keymap, OB_MODE_SCULPT, SCULPT_TOOL_PINCH, PKEY, 0); keymap_brush_select(keymap, OB_MODE_SCULPT, SCULPT_TOOL_INFLATE, IKEY, 0); -- cgit v1.2.3