[Bf-blender-cvs] [7d44184c85c] master: Fix T65094: Sequencer crashes blender when scene strip has NULL scene
Dalai Felinto
noreply at git.blender.org
Sat May 25 00:13:44 CEST 2019
Commit: 7d44184c85cc3ca1e96cd3a9ed84bc4834246f5a
Author: Dalai Felinto
Date: Fri May 24 19:10:27 2019 -0300
Branches: master
https://developer.blender.org/rB7d44184c85cc3ca1e96cd3a9ed84bc4834246f5a
Fix T65094: Sequencer crashes blender when scene strip has NULL scene
Bug introduced on 930765faa81e.
===================================================================
M source/blender/blenkernel/intern/sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index ad4271eaec8..827d7343aad 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -4933,7 +4933,7 @@ void BKE_sequencer_update_sound_bounds_all(Scene *scene)
void BKE_sequencer_update_sound_bounds(Scene *scene, Sequence *seq)
{
if (seq->type == SEQ_TYPE_SCENE) {
- if (seq->scene_sound) {
+ if (seq->scene && seq->scene_sound) {
/* We have to take into account start frame of the sequence's scene! */
int startofs = seq->startofs + seq->anim_startofs + seq->scene->r.sfra;
More information about the Bf-blender-cvs
mailing list