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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-06-17 16:49:09 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-06-18 18:24:18 +0300
commitff4eac74edfa379d210c42f5aaecbeeb54d6742e (patch)
tree760ffb8b320530340ef24c1325c2fc49aab19725
parentf526f410b29202c2994e99dc22266fc0f3fdc0db (diff)
Flush stdout prior of calling render stats callback
Without this extra flush order of stat prints is undefined in the output. which makes it rather tricky to write custom output in a reliable way.
-rw-r--r--source/blender/render/intern/source/pipeline.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index cac4970cd11..da16d2b857d 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -193,6 +193,9 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs)
fprintf(stdout, IFACE_("Sce: %s Ve:%d Fa:%d La:%d"), rs->scene_name, rs->totvert, rs->totface, rs->totlamp);
}
+ /* Flush stdout to be sure python callbacks are printing stuff after blender. */
+ fflush(stdout);
+
BLI_callback_exec(G.main, NULL, BLI_CB_EVT_RENDER_STATS);
fputc('\n', stdout);
@@ -3436,7 +3439,10 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
BLI_timestr(re->i.lastframetime, name, sizeof(name));
printf(" Time: %s", name);
-
+
+ /* Flush stdout to be sure python callbacks are printing stuff after blender. */
+ fflush(stdout);
+
BLI_callback_exec(G.main, NULL, BLI_CB_EVT_RENDER_STATS);
BLI_timestr(re->i.lastframetime - render_time, name, sizeof(name));