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-03-12 14:51:56 +0300
committerTon Roosendaal <ton@blender.org>2006-03-12 14:51:56 +0300
commit8a8c70c63a6d5e7c9fc41e12559ff5c9be0e54dd (patch)
tree7ace83a36c9aeeb8b552e3f30590a6f55f166b10 /source/blender/src/renderwin.c
parent4e4cd9407d57c3fe31675eb2a2fbf8ea8472aa9a (diff)
A couple of render improvements;
- Bug fix: the upper tile in a collumn for Panorama render didn't put the mainthread to sleep properly. Now panorama renders 25% faster if you had set Y-Parts to 4. - Enabling Compositing in Scene for first time now adds a "Composite" node too, so render output gets applied. - An attempt to render with "Do Composite" without "Composite" node will throw an error and stops rendering. In background mode it will just not render at all, and print errors. - Errors that prevent rendering now give a popup menu again. - Having MBlur or Fields option on will now normally render, but with an error print in console (not done yet...)
Diffstat (limited to 'source/blender/src/renderwin.c')
-rw-r--r--source/blender/src/renderwin.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c
index 2562111e59f..e115857e893 100644
--- a/source/blender/src/renderwin.c
+++ b/source/blender/src/renderwin.c
@@ -80,6 +80,7 @@
#include "BIF_renderwin.h"
#include "BIF_resources.h"
#include "BIF_toets.h"
+#include "BIF_toolbox.h"
#include "BIF_writeimage.h"
#include "BDR_editobject.h"
@@ -1030,6 +1031,7 @@ static void end_test_break_callback()
- set callbacks
- cleanup
*/
+static void error_cb(char *str){error(str);}
static void do_render(int anim)
{
@@ -1045,6 +1047,7 @@ static void do_render(int anim)
RE_display_init_cb(re, renderwin_init_display_cb);
RE_display_draw_cb(re, renderwin_progress_display_cb);
RE_display_clear_cb(re, renderwin_clear_display_cb);
+ RE_error_cb(re, error_cb);
init_test_break_callback();
RE_test_break_cb(re, test_break);
RE_timecursor_cb(re, set_timecursor);