Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2019-05-25 01:10:27 +0300
committerDalai Felinto <dfelinto@gmail.com>2019-05-25 01:13:01 +0300
commit7d44184c85cc3ca1e96cd3a9ed84bc4834246f5a (patch)
tree02aced38ba63a340e22b0f158c79382f40d62fee /source
parent0cb2c20ada26b80fc9dfa06dd21caa26e3e3d279 (diff)
Fix T65094: Sequencer crashes blender when scene strip has NULL scene
Bug introduced on 930765faa81e.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c2
1 files changed, 1 insertions, 1 deletions
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;