diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-06-24 18:08:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-24 18:25:44 +0300 |
| commit | b4e1571d0bcf186df979455cf9852dccd325345b (patch) | |
| tree | d13b72ce1050fc0035b9d682a10531bc4a174fbf /intern/cycles/blender | |
| parent | c78b831e69faaa206ca457e80581f6371cad73fa (diff) | |
Cleanup: compiler warnings
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 3 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 53 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 3 |
3 files changed, 13 insertions, 46 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index d9c63bec737..011678a7a65 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -867,8 +867,7 @@ void BlenderSync::sync_view(BL::SpaceView3D &b_v3d, } } -BufferParams BlenderSync::get_buffer_params(BL::Scene &b_scene, - BL::RenderSettings &b_render, +BufferParams BlenderSync::get_buffer_params(BL::RenderSettings &b_render, BL::SpaceView3D &b_v3d, BL::RegionView3D &b_rv3d, Camera *cam, diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 2874ccb6470..391a1b8f473 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -157,14 +157,8 @@ void BlenderSession::create_session() } /* set buffer parameters */ - BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, - b_render, - b_v3d, - b_rv3d, - scene->camera, - width, - height, - session_params.denoising.use); + BufferParams buffer_params = BlenderSync::get_buffer_params( + b_render, b_v3d, b_rv3d, scene->camera, width, height, session_params.denoising.use); session->reset(buffer_params, session_params.samples); b_engine.use_highlight_tiles(session_params.progressive_refine == false); @@ -245,8 +239,7 @@ void BlenderSession::reset_session(BL::BlendData &b_data, BL::Depsgraph &b_depsg BL::SpaceView3D b_null_space_view3d(PointerRNA_NULL); BL::RegionView3D b_null_region_view3d(PointerRNA_NULL); - BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, - b_render, + BufferParams buffer_params = BlenderSync::get_buffer_params(b_render, b_null_space_view3d, b_null_region_view3d, scene->camera, @@ -485,14 +478,8 @@ void BlenderSession::render(BL::Depsgraph &b_depsgraph_) /* get buffer parameters */ SessionParams session_params = BlenderSync::get_session_params( b_engine, b_userpref, b_scene, background, b_view_layer); - BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, - b_render, - b_v3d, - b_rv3d, - scene->camera, - width, - height, - session_params.denoising.use); + BufferParams buffer_params = BlenderSync::get_buffer_params( + b_render, b_v3d, b_rv3d, scene->camera, width, height, session_params.denoising.use); /* temporary render result to find needed passes and views */ BL::RenderResult b_rr = begin_render_result( @@ -838,14 +825,8 @@ void BlenderSession::synchronize(BL::Depsgraph &b_depsgraph_) sync->sync_camera(b_render, b_camera_override, width, height, ""); /* get buffer parameters */ - BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, - b_render, - b_v3d, - b_rv3d, - scene->camera, - width, - height, - session_params.denoising.use); + BufferParams buffer_params = BlenderSync::get_buffer_params( + b_render, b_v3d, b_rv3d, scene->camera, width, height, session_params.denoising.use); if (!buffer_params.denoising_data_pass) { session_params.denoising.use = false; @@ -926,14 +907,8 @@ bool BlenderSession::draw(int w, int h) if (reset) { SessionParams session_params = BlenderSync::get_session_params( b_engine, b_userpref, b_scene, background); - BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, - b_render, - b_v3d, - b_rv3d, - scene->camera, - width, - height, - session_params.denoising.use); + BufferParams buffer_params = BlenderSync::get_buffer_params( + b_render, b_v3d, b_rv3d, scene->camera, width, height, session_params.denoising.use); bool session_pause = BlenderSync::get_session_pause(b_scene, background); if (session_pause == false) { @@ -950,14 +925,8 @@ bool BlenderSession::draw(int w, int h) update_status_progress(); /* draw */ - BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, - b_render, - b_v3d, - b_rv3d, - scene->camera, - width, - height, - session->params.denoising.use); + BufferParams buffer_params = BlenderSync::get_buffer_params( + b_render, b_v3d, b_rv3d, scene->camera, width, height, session->params.denoising.use); DeviceDrawParams draw_params; if (session->params.display_buffer_linear) { diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 85789cd00f6..0214d9eb3b8 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -102,8 +102,7 @@ class BlenderSync { bool background, BL::ViewLayer b_view_layer = BL::ViewLayer(PointerRNA_NULL)); static bool get_session_pause(BL::Scene &b_scene, bool background); - static BufferParams get_buffer_params(BL::Scene &b_scene, - BL::RenderSettings &b_render, + static BufferParams get_buffer_params(BL::RenderSettings &b_render, BL::SpaceView3D &b_v3d, BL::RegionView3D &b_rv3d, Camera *cam, |