diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-12 16:09:33 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-12 16:12:36 +0300 |
commit | 0f4f4d87542b96942234e10421823dcc6766331c (patch) | |
tree | fd545e6a4ed9ad0652e7e7e18fb76a9e1324e748 /intern/cycles/blender/blender_sync.h | |
parent | f52dc2f371923c22a974df7105245f7e0b8148ee (diff) | |
parent | d8957e4ccec4cda1cd72e94045efba6ab2ceb6fd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
-rw-r--r-- | intern/cycles/blender/blender_sync.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index a9f63346e00..fda8cb390c2 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -69,7 +69,8 @@ public: const char *layer = 0); void sync_render_layers(BL::SpaceView3D& b_v3d, const char *layer); array<Pass> sync_render_passes(BL::RenderLayer& b_rlay, - BL::SceneRenderLayer& b_srlay); + BL::SceneRenderLayer& b_srlay, + const SessionParams &session_params); void sync_integrator(); void sync_camera(BL::RenderSettings& b_render, BL::Object& b_override, |