[Bf-blender-cvs] [b9f14ea] master: Fix T36654.

[Antony Riakiotakis]

Commit: b9f14ea56b5e2b7c42b63bc71986bb55f1e7b910
Author: Antony Riakiotakis
Date:   Thu Feb 27 09:39:04 2014 +0200
https://developer.blender.org/rBb9f14ea56b5e2b7c42b63bc71986bb55f1e7b910

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.

===================================================================

M	source/blender/editors/sculpt_paint/paint_ops.c
M	source/blender/makesrna/intern/rna_sculpt_paint.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index ce57b12..9206471 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);
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 75a0058..5827458 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -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);