[Bf-blender-cvs] [305af3e] gooseberry: Fix T43254: Camera required for rendering sequencer scene

[Campbell Barton]

Commit: 305af3ebbeab33154fef0bf4a857464e6fdd76e9
Author: Campbell Barton
Date:   Thu Jan 15 07:07:35 2015 +1100
Branches: gooseberry
https://developer.blender.org/rB305af3ebbeab33154fef0bf4a857464e6fdd76e9

Fix T43254: Camera required for rendering sequencer scene

===================================================================

M       source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/render/intern/source/pipeline.c 
b/source/blender/render/intern/source/pipeline.c
index 87961c0..31543bb 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2540,6 +2540,8 @@ static bool check_valid_compositing_camera(Scene *scene, 
Object *camera_override
 
 static int check_valid_camera(Scene *scene, Object *camera_override, 
ReportList *reports)
 {
+       const char *err_msg = "No camera found in scene \"%s\"";
+
        if (camera_override == NULL && scene->camera == NULL)
                scene->camera = BKE_scene_camera_find(scene);
 
@@ -2548,14 +2550,17 @@ static int check_valid_camera(Scene *scene, Object 
*camera_override, ReportList
                        Sequence *seq = scene->ed->seqbase.first;
 
                        while (seq) {
-                               if (seq->type == SEQ_TYPE_SCENE && seq->scene) {
+                               if ((seq->type == SEQ_TYPE_SCENE) &&
+                                   ((seq->flag & SEQ_SCENE_STRIPS) == 0) &&
+                                   (seq->scene != NULL))
+                               {
                                        if (!seq->scene_camera) {
                                                if (!seq->scene->camera && 
!BKE_scene_camera_find(seq->scene)) {
                                                        /* camera could be 
unneeded due to composite nodes */
                                                        Object *override = 
(seq->scene == scene) ? camera_override : NULL;
 
                                                        if 
(!check_valid_compositing_camera(seq->scene, override)) {
-                                                               
BKE_reportf(reports, RPT_ERROR, "No camera found in scene \"%s\"", 
seq->scene->id.name+2);
+                                                               
BKE_reportf(reports, RPT_ERROR, err_msg, seq->scene->id.name + 2);
                                                                return false;
                                                        }
                                                }
@@ -2567,7 +2572,7 @@ static int check_valid_camera(Scene *scene, Object 
*camera_override, ReportList
                }
        }
        else if (!check_valid_compositing_camera(scene, camera_override)) {
-               BKE_report(reports, RPT_ERROR, "No camera found in scene");
+               BKE_reportf(reports, RPT_ERROR, err_msg, scene->id.name + 2);
                return false;
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs