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_image | |
| 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_image')
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 8218216f9a6..01d2fc28c6b 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -576,16 +576,6 @@ static void image_main_region_init(wmWindowManager *wm, ARegion *ar) // image space manages own v2d // UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy); - /* gizmos */ - if (ar->gizmo_map == NULL) { - const struct wmGizmoMapType_Params wmap_params = { - .spaceid = SPACE_IMAGE, - .regionid = RGN_TYPE_WINDOW, - }; - ar->gizmo_map = WM_gizmomap_new_from_type(&wmap_params); - } - WM_gizmomap_add_handlers(ar, ar->gizmo_map); - /* mask polls mode */ keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", 0, 0); WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); @@ -991,7 +981,7 @@ void ED_spacetype_image(void) /* regions: main window */ art = MEM_callocN(sizeof(ARegionType), "spacetype image region"); art->regionid = RGN_TYPE_WINDOW; - art->keymapflag = ED_KEYMAP_FRAMES | ED_KEYMAP_GPENCIL; + art->keymapflag = ED_KEYMAP_GIZMO | ED_KEYMAP_FRAMES | ED_KEYMAP_GPENCIL; art->init = image_main_region_init; art->draw = image_main_region_draw; art->listener = image_main_region_listener; |