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:
authorCampbell Barton <ideasman42@gmail.com>2021-10-08 04:55:26 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-10-08 05:15:19 +0300
commitf9f88f50cb5c362dd613f58a5312eceb69269282 (patch)
tree809a275d5fc507ad54deeeba75de10fb8ddfc218 /source/blender/editors/space_sequencer/sequencer_edit.c
parent29e496e768cd850f731521c9bb95e017e09885be (diff)
Fix sequencer preview/strip checks
- Drawing annotations used a deprecated value to detect if drawing was supported. - ED_space_sequencer_check_show_strip was checking the preview image type (which doesn't impact strip display). Signed-off-by: Campbell Barton <ideasman42@gmail.com>
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_edit.c')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_edit.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 50a74d9e636..2a29125af19 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -130,14 +130,13 @@ bool ED_space_sequencer_maskedit_poll(bContext *C)
/* Are we displaying the seq output (not channels or histogram). */
bool ED_space_sequencer_check_show_imbuf(SpaceSeq *sseq)
{
- return (ELEM(sseq->view, SEQ_VIEW_PREVIEW, SEQ_VIEW_SEQUENCE_PREVIEW) &&
- ELEM(sseq->mainb, SEQ_DRAW_SEQUENCE, SEQ_DRAW_IMG_IMBUF));
+ return (sseq->mainb == SEQ_DRAW_IMG_IMBUF) &&
+ (ELEM(sseq->view, SEQ_VIEW_PREVIEW, SEQ_VIEW_SEQUENCE_PREVIEW));
}
bool ED_space_sequencer_check_show_strip(SpaceSeq *sseq)
{
- return (ELEM(sseq->view, SEQ_VIEW_SEQUENCE, SEQ_VIEW_SEQUENCE_PREVIEW) &&
- ELEM(sseq->mainb, SEQ_DRAW_SEQUENCE, SEQ_DRAW_IMG_IMBUF));
+ return ELEM(sseq->view, SEQ_VIEW_SEQUENCE, SEQ_VIEW_SEQUENCE_PREVIEW);
}
static bool sequencer_fcurves_targets_color_strip(const FCurve *fcurve)