diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-28 18:41:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-28 18:41:30 +0300 |
| commit | 046735d75148f5e27a3f4917010dd80f1691705d (patch) | |
| tree | db5a18ba5aa7e2178f4f1e34e7959c025b5677dc /intern/cycles/blender/blender_sync.h | |
| parent | 94ab6429bbdaf9f3541c715c5ae32647d454692a (diff) | |
| parent | e3d2df038001af8c67707c20a27e21571b1fdff6 (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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index e63ef9e5e47..d2b362be24d 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -67,9 +67,9 @@ public: int width, int height, void **python_thread_state); void sync_view_layer(BL::SpaceView3D& b_v3d, BL::ViewLayer& b_view_layer); - array<Pass> sync_render_passes(BL::RenderLayer& b_render_layer, - BL::ViewLayer& b_view_layer, - const SessionParams &session_params); + vector<Pass> sync_render_passes(BL::RenderLayer& b_render_layer, + BL::ViewLayer& b_view_layer, + const SessionParams &session_params); void sync_integrator(); void sync_camera(BL::RenderSettings& b_render, BL::Object& b_override, |