diff options
| author | Julian Eisel <julian@blender.org> | 2021-06-05 18:51:46 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-06-05 18:51:46 +0300 |
| commit | 87a821397fa4db7b72ea809ee29c319cf4788a1a (patch) | |
| tree | 5b14c3657585b7e64ce1a3e14492925e0a79f473 /source/blender/sequencer/intern/utils.c | |
| parent | d6e9b0ce5d61f64a3879459c9d39a151aabdea81 (diff) | |
| parent | edaaa2afddb2132e56f39791e559b084b6df8773 (diff) | |
Merge branch 'master' into asset-system-filelistasset-system-filelist
Diffstat (limited to 'source/blender/sequencer/intern/utils.c')
| -rw-r--r-- | source/blender/sequencer/intern/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/sequencer/intern/utils.c b/source/blender/sequencer/intern/utils.c index cf1d7d66476..9aeb2961751 100644 --- a/source/blender/sequencer/intern/utils.c +++ b/source/blender/sequencer/intern/utils.c @@ -43,6 +43,7 @@ #include "SEQ_relations.h" #include "SEQ_select.h" #include "SEQ_sequencer.h" +#include "SEQ_time.h" #include "SEQ_utils.h" #include "IMB_imbuf.h" @@ -406,7 +407,7 @@ const Sequence *SEQ_get_topmost_sequence(const Scene *scene, int frame) } for (seq = ed->seqbasep->first; seq; seq = seq->next) { - if (seq->flag & SEQ_MUTE || seq->startdisp > frame || seq->enddisp <= frame) { + if (seq->flag & SEQ_MUTE || !SEQ_time_strip_intersects_frame(seq, frame)) { continue; } /* Only use strips that generate an image, not ones that combine |