[Bf-blender-cvs] [76277e74023] master: Cleanup: fix compiler warning.

Brecht Van Lommel noreply at git.blender.org
Mon Mar 18 11:12:08 CET 2019


Commit: 76277e74023c0ab6926681c7bca4774fe2d130cb
Author: Brecht Van Lommel
Date:   Mon Mar 18 10:42:40 2019 +0100
Branches: master
https://developer.blender.org/rB76277e74023c0ab6926681c7bca4774fe2d130cb

Cleanup: fix compiler warning.

===================================================================

M	intern/cycles/blender/blender_session.cpp
M	intern/cycles/blender/blender_sync.cpp
M	intern/cycles/blender/blender_sync.h

===================================================================

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index f1cdda5cb13..a06135b5362 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -470,7 +470,7 @@ void BlenderSession::render(BL::Depsgraph& b_depsgraph_)
 	b_rlay_name = b_view_layer.name();
 
 	/* add passes */
-	vector<Pass> passes = sync->sync_render_passes(b_rlay, b_view_layer, session_params);
+	vector<Pass> passes = sync->sync_render_passes(b_rlay, b_view_layer);
 	buffer_params.passes = passes;
 
 	PointerRNA crl = RNA_pointer_get(&b_view_layer.ptr, "cycles");
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 4074d7c99e2..de41258ca51 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -504,8 +504,7 @@ int BlenderSync::get_denoising_pass(BL::RenderPass& b_pass)
 }
 
 vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer& b_rlay,
-                                             BL::ViewLayer& b_view_layer,
-                                             const SessionParams &session_params)
+                                             BL::ViewLayer& b_view_layer)
 {
 	vector<Pass> passes;
 	Pass::add(PASS_COMBINED, passes);
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index bf16de4a9c9..8af3fde3323 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -68,8 +68,7 @@ public:
 	               void **python_thread_state);
 	void sync_view_layer(BL::SpaceView3D& b_v3d, BL::ViewLayer& b_view_layer);
 	vector<Pass> sync_render_passes(BL::RenderLayer& b_render_layer,
-	                                BL::ViewLayer& b_view_layer,
-	                                const SessionParams &session_params);
+	                                BL::ViewLayer& b_view_layer);
 	void sync_integrator();
 	void sync_camera(BL::RenderSettings& b_render,
 	                 BL::Object& b_override,



More information about the Bf-blender-cvs mailing list