Fix T36654.
authorAntony Riakiotakis <kalast@gmail.com>
Thu, 27 Feb 2014 07:39:04 +0000 (09:39 +0200)
committerAntony Riakiotakis <kalast@gmail.com>
Thu, 27 Feb 2014 07:39:39 +0000 (09:39 +0200)
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
source/blender/makesrna/intern/rna_sculpt_paint.c

index ce57b12d0ba4026cd1d1a71d8d5f314d6e5f13f5..920647158a7378e06860a342e3aa124b62f2fab3 100644 (file)
@@ -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);
index 75a005816117c73e2f2170b2892e1025e1bd88b4..58274589126eb1c019cb1a62da796ecb3cdb326a 100644 (file)
@@ -409,6 +409,7 @@ static void rna_def_sculpt(BlenderRNA  *brna)
        prop = RNA_def_property(srna, "detail_size", PROP_INT, PROP_PIXEL);
        RNA_def_property_ui_range(prop, 2, 100, 0, -1);
        RNA_def_property_ui_text(prop, "Detail Size", "Maximum edge length for dynamic topology sculpting (in pixels)");
+       RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL);
 
        prop = RNA_def_property(srna, "use_smooth_shading", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_DYNTOPO_SMOOTH_SHADING);