[Bf-blender-cvs] [5fed3aec4a0] master: VSE: Fix crash when scene strip is added to meta
Richard Antalik
noreply at git.blender.org
Sat Oct 16 01:35:06 CEST 2021
Commit: 5fed3aec4a077b1d14266fc3068241ee8fdd1d7d
Author: Richard Antalik
Date: Sat Oct 16 01:25:27 2021 +0200
Branches: master
https://developer.blender.org/rB5fed3aec4a077b1d14266fc3068241ee8fdd1d7d
VSE: Fix crash when scene strip is added to meta
Caused by 81514b0e913b, missed sanitizing `sound->offset_time` usage in
`seq_update_sound_bounds_recursive_impl()`.
===================================================================
M source/blender/sequencer/intern/strip_time.c
===================================================================
diff --git a/source/blender/sequencer/intern/strip_time.c b/source/blender/sequencer/intern/strip_time.c
index 3c80e1dba27..1c5f4c3ab76 100644
--- a/source/blender/sequencer/intern/strip_time.c
+++ b/source/blender/sequencer/intern/strip_time.c
@@ -131,12 +131,17 @@ static void seq_update_sound_bounds_recursive_impl(Scene *scene,
endofs = seq->start + seq->len - end;
}
+ double offset_time = 0.0f;
+ if (seq->sound != NULL) {
+ offset_time = seq->sound->offset_time;
+ }
+
BKE_sound_move_scene_sound(scene,
seq->scene_sound,
seq->start + startofs,
seq->start + seq->len - endofs,
startofs + seq->anim_startofs,
- seq->sound->offset_time);
+ offset_time);
}
}
}
More information about the Bf-blender-cvs
mailing list