diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2022-05-02 19:20:56 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2022-05-03 09:47:27 +0300 |
| commit | 38a4d96a9061808677d3bc770f1482766fe3f3ed (patch) | |
| tree | fab6e074e05cf989298cb9e360ba7393e9e59440 /source/blender/sequencer/intern | |
| parent | e4e5d7781e9946cd39d44d846b7435406a6e9229 (diff) | |
Fix T97507: Crash when deleting adjustment layer
Issue was not properly fixed in 3cef9ebaf81 due to oversight.
`SEQ_get_channels_by_seq` returned pointer to `seqbase` instead of `channels`.
Diffstat (limited to 'source/blender/sequencer/intern')
| -rw-r--r-- | source/blender/sequencer/intern/channels.c | 6 | ||||
| -rw-r--r-- | source/blender/sequencer/intern/effects.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/sequencer/intern/channels.c b/source/blender/sequencer/intern/channels.c index 21e3461c7d0..5decee5a3bb 100644 --- a/source/blender/sequencer/intern/channels.c +++ b/source/blender/sequencer/intern/channels.c @@ -82,15 +82,15 @@ bool SEQ_channel_is_muted(const SeqTimelineChannel *channel) return (channel->flag & SEQ_CHANNEL_MUTE) != 0; } -ListBase *SEQ_get_channels_by_seq(ListBase *seqbase, const Sequence *seq) +ListBase *SEQ_get_channels_by_seq(ListBase *seqbase, ListBase *channels, const Sequence *seq) { ListBase *lb = NULL; LISTBASE_FOREACH (Sequence *, iseq, seqbase) { if (seq == iseq) { - return seqbase; + return channels; } - if ((lb = SEQ_get_channels_by_seq(&iseq->seqbase, seq))) { + if ((lb = SEQ_get_channels_by_seq(&iseq->seqbase, &iseq->channels, seq))) { return lb; } } diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c index f4fc79a6572..d4dd21add4e 100644 --- a/source/blender/sequencer/intern/effects.c +++ b/source/blender/sequencer/intern/effects.c @@ -2432,7 +2432,7 @@ static ImBuf *do_multicam(const SeqRenderData *context, return NULL; } ListBase *seqbasep = SEQ_get_seqbase_by_seq(&ed->seqbase, seq); - ListBase *channels = SEQ_get_channels_by_seq(&ed->seqbase, seq); + ListBase *channels = SEQ_get_channels_by_seq(&ed->seqbase, &ed->channels, seq); if (!seqbasep) { return NULL; } @@ -2468,7 +2468,7 @@ static ImBuf *do_adjustment_impl(const SeqRenderData *context, Sequence *seq, fl ed = context->scene->ed; ListBase *seqbasep = SEQ_get_seqbase_by_seq(&ed->seqbase, seq); - ListBase *channels = SEQ_get_channels_by_seq(&ed->seqbase, seq); + ListBase *channels = SEQ_get_channels_by_seq(&ed->seqbase, &ed->channels, seq); /* Clamp timeline_frame to strip range so it behaves as if it had "still frame" offset (last * frame is static after end of strip). This is how most strips behave. This way transition |