[Bf-blender-cvs] [6cdba8893f5] greasepencil-object: GP "Add Monkey" - Shift-A can now be used in EditMode to bring up the "Add GPencil Object" menu

[Joshua Leung]

Commit: 6cdba8893f5b33fdb524960e128d8df296a37558
Author: Joshua Leung
Date:   Fri Mar 16 18:50:27 2018 +1300
Branches: greasepencil-object
https://developer.blender.org/rB6cdba8893f5b33fdb524960e128d8df296a37558

GP "Add Monkey" - Shift-A can now be used in EditMode to bring up the "Add GPencil Object" menu

TODO:
It shouldn't trigger in other editors, but right now, the keymaps are
shared, so there's not much that can be done about that.

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index abd4363b92c..ff240049573 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -435,6 +435,9 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
 	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculptmode_toggle", EKEY, KM_PRESS, 0, 0);
 	RNA_int_set(kmi->ptr, "back", 1);
 
+	/* menu - add GP object (3d view only) */
+	WM_keymap_add_item(keymap, "OBJECT_OT_gpencil_add", AKEY, KM_PRESS, KM_SHIFT, 0);
+	
 	/* menu vertex group */
 	WM_keymap_add_menu(keymap, "GPENCIL_MT_gpencil_vertex_group", GKEY, KM_PRESS, KM_CTRL, 0);
 }
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 04d1e9bd9dc..c8002e2308f 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1076,13 +1076,13 @@ static int object_gpencil_add_exec(bContext *C, wmOperator *op)
 
 void OBJECT_OT_gpencil_add(wmOperatorType *ot)
 {
-
 	/* identifiers */
 	ot->name = "Add GPencil";
 	ot->description = "Add a grease pencil object to the scene";
 	ot->idname = "OBJECT_OT_gpencil_add";
 
 	/* api callbacks */
+	ot->invoke = WM_menu_invoke;
 	ot->exec = object_gpencil_add_exec;
 	ot->poll = ED_operator_scene_editable;