diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-10-18 07:47:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-10-18 07:47:28 +0300 |
commit | e538b2c3a38f130787ca604b0e0182a74e9d6976 (patch) | |
tree | 60fa8f77f52e132d55d62d09cff1be5c4297fd2c /source/blender/editors/space_sequencer/space_sequencer.c | |
parent | c5a13ffcb4b98bbd46dca7637051a966d18cd46f (diff) |
Cleanup: internal sequencer naming for overlays
- Rename RNA SpaceSeq.show_strip_overlay to show_overlays
matching the 3D View, the term "strip" was misleading as this is used
for the preview as well.
- Rename various RNA overlay settings to overlay_frame
since "Frame Offset" is a specific feature, avoid having both
Editor.show_overlay and SpaceSeq.show_overlays.
- Rename Editing `over_*` -> `overlay_frame_*` in DNA,
as well as flags.
Diffstat (limited to 'source/blender/editors/space_sequencer/space_sequencer.c')
-rw-r--r-- | source/blender/editors/space_sequencer/space_sequencer.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 3ed8b35c9bf..c876bf7d483 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -783,25 +783,26 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *region) 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_USE_FRAME_OVERLAY) && + (scene->ed->overlay_frame_flag & SEQ_EDIT_OVERLAY_FRAME_SHOW) && draw_overlay); const bool is_playing = ED_screen_animation_playing(wm); - if (!draw_frame_overlay || sseq->overlay_type != SEQ_DRAW_OVERLAY_REFERENCE) { + if (!(draw_frame_overlay && (sseq->overlay_frame_type == SEQ_OVERLAY_FRAME_TYPE_REFERENCE))) { sequencer_draw_preview(C, scene, region, sseq, scene->r.cfra, 0, false, false); } - if (draw_frame_overlay && sseq->overlay_type != SEQ_DRAW_OVERLAY_CURRENT) { + if (draw_frame_overlay && sseq->overlay_frame_type != SEQ_OVERLAY_FRAME_TYPE_CURRENT) { int over_cfra; - if (scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) { - over_cfra = scene->ed->over_cfra; + if (scene->ed->overlay_frame_flag & SEQ_EDIT_OVERLAY_FRAME_ABS) { + over_cfra = scene->ed->overlay_frame_abs; } else { - over_cfra = scene->r.cfra + scene->ed->over_ofs; + over_cfra = scene->r.cfra + scene->ed->overlay_frame_ofs; } - if (over_cfra != scene->r.cfra || sseq->overlay_type != SEQ_DRAW_OVERLAY_RECT) { + if ((over_cfra != scene->r.cfra) || + (sseq->overlay_frame_type != SEQ_OVERLAY_FRAME_TYPE_RECT)) { sequencer_draw_preview( C, scene, region, sseq, scene->r.cfra, over_cfra - scene->r.cfra, true, false); } |