Revision: 43849
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43849
Author: blendix
Date: 2012-02-02 13:21:38 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Fix related to #30053: crash rendering scene strips without a scene (due to
missing library).
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-02-02
13:04:52 UTC (rev 43848)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-02-02
13:21:38 UTC (rev 43849)
@@ -745,7 +745,7 @@
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) {
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2012-02-02 13:04:52 UTC (rev 43848)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2012-02-02 13:21:38 UTC (rev 43849)
@@ -1745,7 +1745,7 @@
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)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
