diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-16 17:14:59 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-16 17:14:59 +0400 |
| commit | f277d9fefceda49f72ff95785b87bed8c3a477fa (patch) | |
| tree | 2affe15a5e7c42d6d1bbc431fb2756d976231d3c | |
| parent | 29ecc722479e6b0130b82595db2d9eb2a568cbf1 (diff) | |
svn merge ^/trunk/blender -c56851
| -rw-r--r-- | source/blender/render/intern/source/external_engine.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 7ce5d9f72de..16e8cbf50dc 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -420,6 +420,11 @@ int RE_engine_render(Render *re, int do_all) if (!do_all && (type->flag & RE_USE_POSTPROCESS)) return 0; + /* update animation here so any render layer animation is applied before + * creating the render result */ + if ((re->r.scemode & (R_NO_FRAME_UPDATE | R_PREVIEWBUTS)) == 0) + BKE_scene_update_for_newframe(re->main, re->scene, re->lay); + /* create render result */ BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE); if (re->result == NULL || !(re->r.scemode & R_PREVIEWBUTS)) { @@ -463,9 +468,6 @@ int RE_engine_render(Render *re, int do_all) engine->resolution_x = re->winx; engine->resolution_y = re->winy; - if ((re->r.scemode & (R_NO_FRAME_UPDATE | R_PREVIEWBUTS)) == 0) - BKE_scene_update_for_newframe(re->main, re->scene, re->lay); - RE_parts_init(re, FALSE); engine->tile_x = re->partx; engine->tile_y = re->party; |