diff options
author | Richard Antalik <richardantalik@gmail.com> | 2022-05-17 22:23:55 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2022-05-17 22:23:55 +0300 |
commit | df26f4f63a90604c5199c2288f9dde8992abfb25 (patch) | |
tree | 7abcbed9734b97a64b7ce3c00f47f4ea31ecd171 /source/blender/sequencer | |
parent | b3b5d4cabb9653b9e5ddb9650378da4dc4aaac20 (diff) | |
parent | 35e73aa3472ab8c1e28feec1829fae79967322b5 (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/sequencer')
-rw-r--r-- | source/blender/sequencer/SEQ_utils.h | 4 | ||||
-rw-r--r-- | source/blender/sequencer/intern/render.c | 4 | ||||
-rw-r--r-- | source/blender/sequencer/intern/utils.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/sequencer/SEQ_utils.h b/source/blender/sequencer/SEQ_utils.h index ec33bca87a3..ce3c81606ea 100644 --- a/source/blender/sequencer/SEQ_utils.h +++ b/source/blender/sequencer/SEQ_utils.h @@ -32,7 +32,9 @@ void SEQ_sequence_base_unique_name_recursive(struct Scene *scene, struct ListBase *seqbasep, struct Sequence *seq); const char *SEQ_sequence_give_name(struct Sequence *seq); -struct ListBase *SEQ_get_seqbase_from_sequence(struct Sequence *seq, int *r_offset); +struct ListBase *SEQ_get_seqbase_from_sequence(struct Sequence *seq, + struct ListBase **channels, + int *r_offset); const struct Sequence *SEQ_get_topmost_sequence(const struct Scene *scene, int frame); /** * In cases where we don't know the sequence's listbase. diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c index 8d8a13be09e..1b9e89a35d5 100644 --- a/source/blender/sequencer/intern/render.c +++ b/source/blender/sequencer/intern/render.c @@ -1586,10 +1586,10 @@ static ImBuf *do_render_strip_seqbase(const SeqRenderData *context, { ImBuf *ibuf = NULL; ListBase *seqbase = NULL; - ListBase *channels = &seq->channels; + ListBase *channels = NULL; int offset; - seqbase = SEQ_get_seqbase_from_sequence(seq, &offset); + seqbase = SEQ_get_seqbase_from_sequence(seq, &channels, &offset); if (seqbase && !BLI_listbase_is_empty(seqbase)) { diff --git a/source/blender/sequencer/intern/utils.c b/source/blender/sequencer/intern/utils.c index da422c4228f..0cf47420d8f 100644 --- a/source/blender/sequencer/intern/utils.c +++ b/source/blender/sequencer/intern/utils.c @@ -225,13 +225,14 @@ const char *SEQ_sequence_give_name(Sequence *seq) return name; } -ListBase *SEQ_get_seqbase_from_sequence(Sequence *seq, int *r_offset) +ListBase *SEQ_get_seqbase_from_sequence(Sequence *seq, ListBase **r_channels, int *r_offset) { ListBase *seqbase = NULL; switch (seq->type) { case SEQ_TYPE_META: { seqbase = &seq->seqbase; + *r_channels = &seq->channels; *r_offset = seq->start; break; } @@ -240,6 +241,7 @@ ListBase *SEQ_get_seqbase_from_sequence(Sequence *seq, int *r_offset) Editing *ed = SEQ_editing_get(seq->scene); if (ed) { seqbase = &ed->seqbase; + *r_channels = &ed->channels; *r_offset = seq->scene->r.sfra; } } |