Merged changes in the trunk up to revision 43881.
[blender.git] / source / blender / render / intern / source / pipeline.c
index da33996fa99b74393f22b9170b7c0227e42d39d7..9ed2d845cf79597c38bdd8059c204506cbf8674e 100644 (file)
@@ -1819,7 +1819,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) {