diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2022-08-02 18:57:12 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2022-08-02 18:57:12 +0300 |
| commit | ac9d9c993ad1610881828e89f131dc7e9bf8e8c2 (patch) | |
| tree | c7d021d986368309f9f19d0807d587a27eb597ca /source/blender | |
| parent | 09ac5f97a7ef0381618f1e144795659b285da130 (diff) | |
| parent | 97b226ac51188ce1f4ab8bee7820c7dd296c7012 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/sequencer/intern/utils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/sequencer/intern/utils.c b/source/blender/sequencer/intern/utils.c index 2026e322763..e6c641a5532 100644 --- a/source/blender/sequencer/intern/utils.c +++ b/source/blender/sequencer/intern/utils.c @@ -338,14 +338,15 @@ void seq_open_anim_file(Scene *scene, Sequence *seq, bool openfile) const Sequence *SEQ_get_topmost_sequence(const Scene *scene, int frame) { Editing *ed = scene->ed; - ListBase *channels = SEQ_channels_displayed_get(ed); - const Sequence *seq, *best_seq = NULL; - int best_machine = -1; if (!ed) { return NULL; } + ListBase *channels = SEQ_channels_displayed_get(ed); + const Sequence *seq, *best_seq = NULL; + int best_machine = -1; + for (seq = ed->seqbasep->first; seq; seq = seq->next) { if (SEQ_render_is_muted(channels, seq) || !SEQ_time_strip_intersects_frame(scene, seq, frame)) { |