Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2020-03-25 02:09:14 +0300
committerRichard Antalik <richardantalik@gmail.com>2020-03-25 02:09:14 +0300
commite1c7549ac98aca4428d7125972f9f029f260faa8 (patch)
tree2db315a360decb53b070c9608b1000d3d4718d5c /source/blender/editors/space_sequencer
parent8e8fdf875d080f2bebedf25815768de02147f4be (diff)
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
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r--source/blender/editors/space_sequencer/space_sequencer.c7
1 files changed, 3 insertions, 4 deletions
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) {