diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:43:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:43:18 +0300 |
| commit | ecc57e7524bf04d498646715dcf4f9340ef3fc56 (patch) | |
| tree | 220f951e1ff1be7bc769a1401845928f3f581330 /source/blender/render | |
| parent | 9c629b06bfdf645c009d953902c936b82900053a (diff) | |
| parent | d645b1a78a752950d061a4ccb125721acade5544 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 14160782898..8ecfe801d70 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2325,7 +2325,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie /* 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_callback_exec(re->main, NULL, BLI_CB_EVT_RENDER_STATS); BLI_timecode_string_from_time_simple(name, sizeof(name), re->i.lastframetime - render_time); printf(" (Saving: %s)\n", name); |