diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-12 10:47:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-12 10:51:14 +0300 |
| commit | df6530594f02969e6fae25df38d1b947411a9a82 (patch) | |
| tree | bb2743a2d9eb6cb6dc33dc6ee850471a6833ebf0 /source/blender/editors/space_node | |
| parent | 5aeec318217729288bb16fd6ec0b09802f86f452 (diff) | |
Fix T57527: GP draw takes events from gizmos
Add keymap flag to the gizmo handler so events can be handled
on the UI level and not get over-ridden by grease pencil.
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/space_node.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 38bc1b6da8d..ba5703946c3 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -646,14 +646,6 @@ static void node_main_region_init(wmWindowManager *wm, ARegion *ar) UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy); - /* gizmos stay in the background for now - quick patchjob to make sure nodes themselves work */ - if (ar->gizmo_map == NULL) { - ar->gizmo_map = WM_gizmomap_new_from_type( - &(const struct wmGizmoMapType_Params){SPACE_NODE, RGN_TYPE_WINDOW}); - } - - WM_gizmomap_add_handlers(ar, ar->gizmo_map); - /* own keymaps */ keymap = WM_keymap_ensure(wm->defaultconf, "Node Generic", SPACE_NODE, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); @@ -987,6 +979,7 @@ void ED_spacetype_node(void) /* regions: main window */ art = MEM_callocN(sizeof(ARegionType), "spacetype node region"); art->regionid = RGN_TYPE_WINDOW; + art->keymapflag = ED_KEYMAP_GIZMO; art->init = node_main_region_init; art->draw = node_main_region_draw; art->listener = node_region_listener; |