[Bf-blender-cvs] [0c1676f3889] blender2.8: WM: call keymap callback from manipulators

Campbell Barton noreply at git.blender.org
Tue May 22 09:27:13 CEST 2018


Commit: 0c1676f388928d1d085f05dbcd9458f7616f3dab
Author: Campbell Barton
Date:   Tue May 22 09:25:34 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0c1676f388928d1d085f05dbcd9458f7616f3dab

WM: call keymap callback from manipulators

Not currently needed, add to avoid confusion later on.

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

M	source/blender/windowmanager/intern/wm_event_system.c

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

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 4d01927fb9e..df19f30e31e 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2417,6 +2417,10 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
 									CTX_wm_manipulator_group_set(C, NULL);
 
 									if (action & WM_HANDLER_BREAK) {
+										if (handler->keymap_callback != NULL) {
+											handler->keymap_callback(keymap, kmi, handler->keymap_callback_user_data);
+										}
+
 										if (G.debug & (G_DEBUG_EVENTS | G_DEBUG_HANDLERS)) {
 											printf("%s:       handled - and pass on! '%s'\n",
 											       __func__, kmi->idname);



More information about the Bf-blender-cvs mailing list