diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-10 17:53:38 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-10 17:53:38 +0400 |
| commit | ab52b15964243c7424f61ae0472bcff2e5571464 (patch) | |
| tree | 04d06f19cfe2986ca60f80a7a04748bb43f9f55a /source/blender/editors/render | |
| parent | 4863feb95640bffa0a2c250f1b9da13100643fd2 (diff) | |
Fix #35681: cycles excluded layers still got evaluated before and after
rendering even if they were not used on any render layers.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 4b62eb7c645..da2f8bd2f9d 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -422,7 +422,7 @@ static void render_endjob(void *rjv) free_main(rj->main); /* else the frame will not update for the original value */ - if (!(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) { + if (rj->anim && !(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) { /* possible this fails of loading new file while rendering */ if (G.main->wm.first) { ED_update_for_newframe(G.main, rj->scene, 1); |