Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2006-06-29 14:48:30 +0400
committerTon Roosendaal <ton@blender.org>2006-06-29 14:48:30 +0400
commite5d4c789a1245592e2371ae691510e77be8173ab (patch)
tree45ffff4b40f0e02ac086c631b1557af4edabb45c
parent7920197b38d87d80887ba6d41f4225f2838b197f (diff)
Bugfix #4535
A proper check for the error "No Camera" on rendering can only be made after a renderwindow was initialized. The error menu then shows in the render window, which appears to not work OK in windows ATI (again!). So; I've moved the test to before the renderwindow is activated, this is not a test checking on the entire render pipeline (like Composite nodes or sequence strips). In case more complex setups cannot render, an error is printed in the console only.
-rw-r--r--source/blender/render/intern/source/pipeline.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 74c92bcd30e..5de50c2f8c0 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1458,9 +1458,9 @@ static void load_backbuffer(Render *re)
/* main render routine, no compositing */
static void do_render_fields_blur_3d(Render *re)
{
- /* only check for camera here */
+ /* also check for camera here */
if(re->scene->camera==NULL) {
- re->error("No camera");
+ printf("ERROR: Cannot render, no camera\n");
G.afbreek= 1;
return;
}
@@ -1795,6 +1795,13 @@ static int is_rendering_allowed(Render *re)
if(re->scene->camera==NULL)
re->scene->camera= scene_find_camera(re->scene);
+ if(!(re->r.scemode & (R_DOSEQ|R_DOCOMP))) {
+ if(re->scene->camera==NULL) {
+ re->error("No camera");
+ return 0;
+ }
+ }
+
return 1;
}