From 01d0e279dba2cba3f07d0e3ed3d4a685cebcc3c4 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 2 Feb 2012 13:21:38 +0000 Subject: [PATCH] Fix related to #30053: crash rendering scene strips without a scene (due to missing library). --- source/blender/blenkernel/intern/sequencer.c | 2 +- source/blender/render/intern/source/pipeline.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 08b53115919..d18a71d3c55 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -745,7 +745,7 @@ void reload_sequence_new_file(Scene *scene, Sequence * seq, int lock_range) seq->scene = sce; } - seq->len= seq->scene->r.efra - seq->scene->r.sfra + 1; + seq->len= (seq->scene)? seq->scene->r.efra - seq->scene->r.sfra + 1: 0; seq->len -= seq->anim_startofs; seq->len -= seq->anim_endofs; if (seq->len < 0) { diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 604ba189dcf..100b12aa169 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1745,7 +1745,7 @@ static int check_valid_camera(Scene *scene, Object *camera_override) check_comp= 0; while(seq) { - if(seq->type == SEQ_SCENE) { + if(seq->type == SEQ_SCENE && seq->scene) { if(!seq->scene_camera) { if(!seq->scene->camera && !scene_find_camera(seq->scene)) { if(seq->scene == scene) {