[Bf-blender-cvs] [f4a06b390ba] blender2.8: Keymap: use Q key for quick menu in gpencil mode

[Campbell Barton]

Commit: f4a06b390ba779bd4dbd57ffb9121df53e343dc3
Author: Campbell Barton
Date:   Wed Aug 1 12:19:46 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBf4a06b390ba779bd4dbd57ffb9121df53e343dc3

Keymap: use Q key for quick menu in gpencil mode

Note, the keys for changing line display are now more obscure
(Shift-Q, Shift-Alt-Q), and might be changed.

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

M	source/blender/editors/gpencil/gpencil_ops.c

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

diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 43ccc77e921..3a86b0c13ef 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -248,7 +248,17 @@ static void ed_keymap_gpencil_selection(wmKeyMap *keymap)
 	/* select more/less */
 	WM_keymap_add_item(keymap, "GPENCIL_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "GPENCIL_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
+}
 
+static void ed_keymap_gpencil_display(wmKeyMap *keymap)
+{
+	wmKeyMapItem *kmi;
+
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", QKEY, KM_PRESS, KM_SHIFT, 0);
+	RNA_string_set(kmi->ptr, "data_path", "space_data.overlay.use_gpencil_edit_lines");
+
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", QKEY, KM_PRESS, KM_SHIFT | KM_ALT, 0);
+	RNA_string_set(kmi->ptr, "data_path", "space_data.overlay.use_gpencil_multiedit_line_only");
 }
 
 static void ed_keymap_gpencil_sculpt(wmKeyMap *keymap)
@@ -403,11 +413,8 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
 
 	WM_keymap_add_item(keymap, "GPENCIL_OT_selection_opacity_toggle", HKEY, KM_PRESS, KM_CTRL, 0);
 
-	/* toogle multiedit support */
-	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", QKEY, KM_PRESS, 0, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.overlay.use_gpencil_edit_lines");
-	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", QKEY, KM_PRESS, KM_SHIFT, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.overlay.use_gpencil_multiedit_line_only");
+	/* Display. */
+	ed_keymap_gpencil_display(keymap);
 
 	/* Isolate Layer */
 	WM_keymap_add_item(keymap, "GPENCIL_OT_layer_isolate", PADASTERKEY, KM_PRESS, 0, 0);
@@ -592,7 +599,6 @@ static void ed_keymap_gpencil_painting(wmKeyConfig *keyconf)
 static void ed_keymap_gpencil_sculpting(wmKeyConfig *keyconf)
 {
 	wmKeyMap *keymap = WM_keymap_find(keyconf, "Grease Pencil Stroke Sculpt Mode", 0, 0);
-	wmKeyMapItem *kmi;
 
 	/* set poll callback - so that this keymap only gets enabled when stroke sculptmode is enabled */
 	keymap->poll = gp_stroke_sculptmode_poll;
@@ -603,11 +609,8 @@ static void ed_keymap_gpencil_sculpting(wmKeyConfig *keyconf)
 	/* sculpt */
 	ed_keymap_gpencil_sculpt(keymap);
 
-	/* toogle multiedit support */
-	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", QKEY, KM_PRESS, 0, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.overlay.use_gpencil_edit_lines");
-	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", QKEY, KM_PRESS, KM_SHIFT, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.overlay.use_gpencil_multiedit_line_only");
+	/* Display. */
+	ed_keymap_gpencil_display(keymap);
 }
 
 /* Stroke Weight Paint Keymap - Only when weight is enabled */
@@ -633,11 +636,8 @@ static void ed_keymap_gpencil_weightpainting(wmKeyConfig *keyconf)
 	kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, 0, 0);
 	RNA_string_set(kmi->ptr, "data_path_primary", "tool_settings.gpencil_sculpt.weight_brush.size");
 
-	/* toogle multiedit support */
-	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", QKEY, KM_PRESS, 0, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.overlay.use_gpencil_edit_lines");
-	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", QKEY, KM_PRESS, KM_SHIFT, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.overlay.use_gpencil_multiedit_line_only");
+	/* Display. */
+	ed_keymap_gpencil_display(keymap);
 }
 /* ==================== */