diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-28 02:24:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-28 02:24:38 +0400 |
| commit | f13829c7826e61c14d78f20bd347228f01367706 (patch) | |
| tree | b4ccd417411dbbcef50187169a285ce5953578af /source/blender/render | |
| parent | 765a10a8cdaa09ba7ffb06139c05255948d41518 (diff) | |
| parent | d15d78a33a8df76b02fa0d27dacd85c8a77ec109 (diff) | |
svn merge ^/trunk/blender -r55594:55635
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 721bfa01a92..1450af4ff83 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2373,6 +2373,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie char name[FILE_MAX]; RenderResult rres; Object *camera = RE_GetCamera(re); + double render_time; int ok = 1; RE_AcquireResultImage(re, &rres); @@ -2456,11 +2457,17 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie RE_ReleaseResultImage(re); + render_time = re->i.lastframetime; + re->i.lastframetime = PIL_check_seconds_timer() - re->i.starttime; + BLI_timestr(re->i.lastframetime, name); printf(" Time: %s", name); - + BLI_callback_exec(G.main, NULL, BLI_CB_EVT_RENDER_STATS); + BLI_timestr(re->i.lastframetime - render_time, name); + printf(" (Saving: %s)\n", name); + fputc('\n', stdout); fflush(stdout); /* needed for renderd !! (not anymore... (ton)) */ |