griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bugfix [#23106] Blender crashes (segfault) when scene strip file is missing

Browse Source
This commit is contained in:
Campbell Barton
2010-07-30 11:40:23 +00:00
parent 385c8af449
commit 9e45fa7f2f
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1800,8 +1800,8 @@ static ImBuf * seq_render_scene_strip_impl(
{
ImBuf * ibuf = 0;
float frame= seq->sfra + nr + seq->anim_startofs;
float oldcfra = seq->scene->r.cfra;
Object *oldcamera= seq->scene->camera;
float oldcfra;
Object *oldcamera;
ListBase oldmarkers;
/* Hack! This function can be called from do_render_seq(), in that case
@@ -1820,21 +1820,20 @@ static ImBuf * seq_render_scene_strip_impl(
int doseq;
int doseq_gl= G.rendering ? /*(scene->r.seq_flag & R_SEQ_GL_REND)*/ 0 : (scene->r.seq_flag & R_SEQ_GL_PREV);
int have_seq= FALSE;
Scene *sce= seq->scene;// *oldsce= scene;
Scene *sce= seq->scene; /* dont refer to seq->scene above this point!, it can be NULL */
int sce_valid= FALSE;
have_seq= (sce->r.scemode & R_DOSEQ)
&& sce->ed && sce->ed->seqbase.first;
if(sce) {
have_seq= (sce->r.scemode & R_DOSEQ) && sce->ed && sce->ed->seqbase.first;
sce_valid= (sce->camera || have_seq);
}
if (!sce_valid) {
return 0;
}
if (!sce_valid)
return NULL;
oldcfra= seq->scene->r.cfra;
oldcamera= seq->scene->camera;
/* prevent eternal loop */
doseq= scene->r.scemode & R_DOSEQ;
scene->r.scemode &= ~R_DOSEQ;