[Bf-blender-cvs] [cd800656865] blender-v3.2-release: Fix T100049: Crash when render finishes
Richard Antalik
noreply at git.blender.org
Tue Aug 2 20:15:45 CEST 2022
Commit: cd800656865e6feed6a4f72d6bf5b33a67cbad40
Author: Richard Antalik
Date: Tue Aug 2 17:52:40 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBcd800656865e6feed6a4f72d6bf5b33a67cbad40
Fix T100049: Crash when render finishes
Caused by NULL dereference of `Editing` before NULL check was done.
===================================================================
M source/blender/sequencer/intern/utils.c
===================================================================
diff --git a/source/blender/sequencer/intern/utils.c b/source/blender/sequencer/intern/utils.c
index 0cf47420d8f..751cf680651 100644
--- a/source/blender/sequencer/intern/utils.c
+++ b/source/blender/sequencer/intern/utils.c
@@ -384,14 +384,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(seq, frame)) {
continue;
More information about the Bf-blender-cvs
mailing list