diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-10-16 13:45:41 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-10-16 14:00:45 +0300 |
| commit | 345175082b1387270988f0d61fd43f09bbcf6afd (patch) | |
| tree | 8c5d46c3bbb949483db5997a07ed12646213abaa /source/blender/render | |
| parent | eba1b0487c8e24c13b1b8c134710a6c65875100c (diff) | |
Fix T57247: Render animation does not respect render single view layer
Reviewers: brecht
Maniphest Tasks: T57247
Differential Revision: https://developer.blender.org/D3800
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 3 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 84e6c9ddd55..cc2bd01718a 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -279,7 +279,8 @@ bool RE_WriteRenderViewsMovie( void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, struct ViewLayer *single_layer, struct Object *camera_override, int frame, const bool write_still); -void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene *scene, struct Object *camera_override, +void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene *scene, + struct ViewLayer *single_layer, struct Object *camera_override, int sfra, int efra, int tfra); #ifdef WITH_FREESTYLE void RE_RenderFreestyleStrokes(struct Render *re, struct Main *bmain, struct Scene *scene, int render); diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index b9ebaa8c184..81679caddd9 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2349,7 +2349,7 @@ static void re_movie_free_all(Render *re, bMovieHandle *mh, int totvideos) } /* saves images to disk */ -void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_override, +void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, ViewLayer *single_layer, Object *camera_override, int sfra, int efra, int tfra) { RenderData rd = scene->r; @@ -2364,7 +2364,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri BLI_callback_exec(re->main, (ID *)scene, BLI_CB_EVT_RENDER_INIT); /* do not fully call for each frame, it initializes & pops output window */ - if (!render_initialize_from_main(re, &rd, bmain, scene, NULL, camera_override, 0, 1)) + if (!render_initialize_from_main(re, &rd, bmain, scene, single_layer, camera_override, 0, 1)) return; if (is_movie) { @@ -2451,7 +2451,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri /* only border now, todo: camera lens. (ton) */ render_initialize_from_main(re, &rd, bmain, scene, - NULL, camera_override, 1, 0); + single_layer, camera_override, 1, 0); if (nfra != scene->r.cfra) { /* Skip this frame, but could update for physics and particles system. */ |