[Bf-blender-cvs] [15b793b] GPencil_Editing_Stage3: GPencil Keymap: Pen Eraser can now be used for erasing strokes

Joshua Leung noreply at git.blender.org
Sat Sep 19 01:50:15 CEST 2015


Commit: 15b793bd8440e6e39d516cbd4bd0ec265d62360c
Author: Joshua Leung
Date:   Sat Sep 19 11:49:47 2015 +1200
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB15b793bd8440e6e39d516cbd4bd0ec265d62360c

GPencil Keymap: Pen Eraser can now be used for erasing strokes

Using the keymap support added in the previous commit, we can now map the
pen's eraser to trigger erasing.

Pen drawing support is not enabled though, since users who use a tablet as
their primary pointing device will want to be able to continue using it
for things like selection, grabbing manipulators, and sculpting/texture painting.

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

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 2a72795..38cc1f5 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -75,11 +75,25 @@ static void ed_keymap_gpencil_general(wmKeyConfig *keyconf)
 	RNA_boolean_set(kmi->ptr, "wait_for_input", false);
 	
 	/* erase */
-	/* TODO: it would be nice to be able to catch tablet events for this... */
 	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_draw", RIGHTMOUSE, KM_PRESS, 0, DKEY);
 	RNA_enum_set(kmi->ptr, "mode", GP_PAINTMODE_ERASER);
 	RNA_boolean_set(kmi->ptr, "wait_for_input", false);
 	
+	
+	/* Tablet Mappings for Drawing ------------------ */
+	/* For now, only support direct drawing using the eraser, as most users using a tablet
+	 * may still want to use that as their primary pointing device!
+	 */
+#if 0
+	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_draw", TABLET_STYLUS, KM_PRESS, 0, 0);
+	RNA_enum_set(kmi->ptr, "mode", GP_PAINTMODE_DRAW);
+	RNA_boolean_set(kmi->ptr, "wait_for_input", false);
+#endif
+	
+	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_draw", TABLET_ERASER, KM_PRESS, 0, 0);
+	RNA_enum_set(kmi->ptr, "mode", GP_PAINTMODE_ERASER);
+	RNA_boolean_set(kmi->ptr, "wait_for_input", false);
+	
 	/* Viewport Tools ------------------------------- */
 	
 	/* Enter EditMode */




More information about the Bf-blender-cvs mailing list