[Bf-blender-cvs] [5fde78dcad6] master: Cycles: Fix unused argument warning when building without debug passes

Sergey Sharybin noreply at git.blender.org
Thu May 4 09:34:21 CEST 2017


Commit: 5fde78dcad66f2d47aacff685263aa4b593877d7
Author: Sergey Sharybin
Date:   Thu May 4 09:33:51 2017 +0200
Branches: master
https://developer.blender.org/rB5fde78dcad66f2d47aacff685263aa4b593877d7

Cycles: Fix unused argument warning when building without debug passes

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

M	intern/cycles/blender/blender_sync.cpp

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

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 17d2378b7ab..f362eade954 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -526,7 +526,7 @@ PassType BlenderSync::get_pass_type(BL::RenderPass& b_pass)
 }
 
 array<Pass> BlenderSync::sync_render_passes(BL::RenderLayer& b_rlay,
-	                                        BL::SceneRenderLayer& b_srlay)
+                                            BL::SceneRenderLayer& b_srlay)
 {
 	array<Pass> passes;
 	Pass::add(PASS_COMBINED, passes);
@@ -562,6 +562,8 @@ array<Pass> BlenderSync::sync_render_passes(BL::RenderLayer& b_rlay,
 		b_engine.add_pass("Debug Ray Bounces", 1, "X", b_srlay.name().c_str());
 		Pass::add(PASS_RAY_BOUNCES, passes);
 	}
+#else
+	(void) b_srlay;  /* Ignored. */
 #endif
 
 	return passes;




More information about the Bf-blender-cvs mailing list