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/include/ED_screen.h | |
| 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/include/ED_screen.h')
| -rw-r--r-- | source/blender/editors/include/ED_screen.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index 7c05bfd829d..a5660c43416 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -356,14 +356,17 @@ struct ARegionType *ED_area_type_hud(int space_type); void ED_area_type_hud_clear(struct wmWindowManager *wm, ScrArea *sa_keep); void ED_area_type_hud_ensure(struct bContext *C, struct ScrArea *sa); -/* default keymaps, bitflags */ -#define ED_KEYMAP_UI 1 -#define ED_KEYMAP_VIEW2D 2 -#define ED_KEYMAP_MARKERS 4 -#define ED_KEYMAP_ANIMATION 8 -#define ED_KEYMAP_FRAMES 16 -#define ED_KEYMAP_GPENCIL 32 -#define ED_KEYMAP_HEADER 64 +/* default keymaps, bitflags (matches order of evaluation). */ +enum { + ED_KEYMAP_UI = (1 << 1), + ED_KEYMAP_GIZMO = (1 << 2), + ED_KEYMAP_VIEW2D = (1 << 3), + ED_KEYMAP_MARKERS = (1 << 4), + ED_KEYMAP_ANIMATION = (1 << 5), + ED_KEYMAP_FRAMES = (1 << 6), + ED_KEYMAP_HEADER = (1 << 7), + ED_KEYMAP_GPENCIL = (1 << 8), +}; /* SCREEN_OT_space_context_cycle direction */ enum { |