diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-11-05 08:04:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-11-05 08:04:52 +0300 |
commit | b9968b83ad4060133abc824180873cca549d08de (patch) | |
tree | f671edf231c674aabac743696054807b4cba9d6b /source/blender | |
parent | 40d090cc725e1f8727ae33f3a702543f309f9a03 (diff) | |
parent | 445361c2ace8fe51c874ec234e8786578c8e4635 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/space_sequencer.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 09cb21eca1e..379788ecf49 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -2782,6 +2782,10 @@ void draw_timeline_seq(const bContext *C, ARegion *region) UI_view2d_view_ortho(v2d); ANIM_draw_previewrange(C, v2d, 1); + if ((sseq->gizmo_flag & SEQ_GIZMO_HIDE) == 0) { + WM_gizmomap_draw(region->gizmo_map, C, WM_GIZMOMAP_DRAWSTEP_2D); + } + /* Draw registered callbacks. */ GPU_framebuffer_bind(framebuffer_overlay); ED_region_draw_cb_draw(C, region, REGION_DRAW_POST_VIEW); diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index ed8305cd311..f5aabecd309 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -997,7 +997,9 @@ void ED_spacetype_sequencer(void) art->draw_overlay = sequencer_main_region_draw_overlay; art->listener = sequencer_main_region_listener; art->message_subscribe = sequencer_main_region_message_subscribe; - art->keymapflag = ED_KEYMAP_TOOL | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_ANIMATION; + /* NOTE: inclusion of #ED_KEYMAP_GIZMO is currenlty for scripts and isn't used by default. */ + art->keymapflag = ED_KEYMAP_TOOL | ED_KEYMAP_GIZMO | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | + ED_KEYMAP_ANIMATION; BLI_addhead(&st->regiontypes, art); /* Preview. */ |