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_view3d/space_view3d.c | |
| 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_view3d/space_view3d.c')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 8fe4a95927d..044cb56d367 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -458,13 +458,6 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *ar) ListBase *lb; wmKeyMap *keymap; - if (ar->gizmo_map == NULL) { - ar->gizmo_map = WM_gizmomap_new_from_type( - &(const struct wmGizmoMapType_Params) {SPACE_VIEW3D, RGN_TYPE_WINDOW}); - } - - WM_gizmomap_add_handlers(ar, ar->gizmo_map); - /* object ops. */ /* important to be before Pose keymap since they can both be enabled at once */ @@ -1479,7 +1472,7 @@ void ED_spacetype_view3d(void) /* regions: main window */ art = MEM_callocN(sizeof(ARegionType), "spacetype view3d main region"); art->regionid = RGN_TYPE_WINDOW; - art->keymapflag = ED_KEYMAP_GPENCIL; + art->keymapflag = ED_KEYMAP_GIZMO | ED_KEYMAP_GPENCIL; art->draw = view3d_main_region_draw; art->init = view3d_main_region_init; art->exit = view3d_main_region_exit; |