1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix related to #30053: crash rendering scene strips without a scene (due to missing library).

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-02-02 13:21:38 +00:00
parent 45155785e3
commit 01d0e279db
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/sequencer.c
View File

@ -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) {

2
source/blender/render/intern/source/pipeline.c
View File

@ -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) {