From e1c7549ac98aca4428d7125972f9f029f260faa8 Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Wed, 25 Mar 2020 00:09:14 +0100 Subject: Fix T75019: Frame Offset does not apply to scopes Don't check for `sseq->mainb == SEQ_DRAW_IMG_IMBUF`. Reviewed By: brecht Differential Revision: https://developer.blender.org/D7228 --- source/blender/editors/space_sequencer/space_sequencer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/space_sequencer') diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 1aa2a0c9c44..21833bfda71 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -679,19 +679,18 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *region) SpaceSeq *sseq = sa->spacedata.first; Scene *scene = CTX_data_scene(C); wmWindowManager *wm = CTX_wm_manager(C); - const bool show_split = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) && - (sseq->mainb == SEQ_DRAW_IMG_IMBUF)); + const bool draw_overlay = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW)); /* XXX temp fix for wrong setting in sseq->mainb */ if (sseq->mainb == SEQ_DRAW_SEQUENCE) { sseq->mainb = SEQ_DRAW_IMG_IMBUF; } - if (!show_split || sseq->overlay_type != SEQ_DRAW_OVERLAY_REFERENCE) { + if (!draw_overlay || sseq->overlay_type != SEQ_DRAW_OVERLAY_REFERENCE) { sequencer_draw_preview(C, scene, region, sseq, scene->r.cfra, 0, false, false); } - if (show_split && sseq->overlay_type != SEQ_DRAW_OVERLAY_CURRENT) { + if (draw_overlay && sseq->overlay_type != SEQ_DRAW_OVERLAY_CURRENT) { int over_cfra; if (scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) { -- cgit v1.2.3