diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2021-10-09 09:37:14 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2021-10-09 09:41:07 +0300 |
| commit | 27ac80f068a94acbd1c04df45db00787da7299d3 (patch) | |
| tree | 7a192bd5f45a01b2c5b9a3cf6e49be57e7ca566e /source/blender/editors/space_sequencer | |
| parent | 13df8616ce64a883aa9d44283ca0bfcb2c5c3d13 (diff) | |
VSE: rename flag for Frame Overlay feature
Rename `SEQ_EDIT_OVERLAY_SHOW` to `SEQ_EDIT_USE_FRAME_OVERLAY` to avoid
confusion between `SEQ_SHOW_OVERLAY` of `SpaceSeq.flag`
Diffstat (limited to 'source/blender/editors/space_sequencer')
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c index 1e0ecfd890e..f0940cd9f55 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.c +++ b/source/blender/editors/space_sequencer/sequencer_buttons.c @@ -78,7 +78,7 @@ static void metadata_panel_context_draw(const bContext *C, Panel *panel) SpaceSeq *space_sequencer = CTX_wm_space_seq(C); /* NOTE: We can only reliably show metadata for the original (current) * frame when split view is used. */ - const bool show_split = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) && + const bool show_split = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_USE_FRAME_OVERLAY) && (space_sequencer->mainb == SEQ_DRAW_IMG_IMBUF)); if (show_split && space_sequencer->overlay_type == SEQ_DRAW_OVERLAY_REFERENCE) { return; diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 6e4c3c774a2..922b6b251ed 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -2807,7 +2807,7 @@ void draw_timeline_seq_display(const bContext *C, ARegion *region) if (scene->ed != NULL) { UI_view2d_view_ortho(v2d); draw_cache_view(C); - if (scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) { + if (scene->ed->over_flag & SEQ_EDIT_USE_FRAME_OVERLAY) { draw_overlap_frame_indicator(scene, v2d); } UI_view2d_view_restore(C); diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 25a08abdabc..72db47c0a76 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -782,7 +782,7 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *region) Scene *scene = CTX_data_scene(C); wmWindowManager *wm = CTX_wm_manager(C); const bool draw_overlay = sseq->flag & SEQ_SHOW_OVERLAY; - const bool draw_frame_overlay = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) && + const bool draw_frame_overlay = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_USE_FRAME_OVERLAY) && draw_overlay); const bool is_playing = ED_screen_animation_playing(wm); |