Merge branch 'master' into blender2.8

2017-05-04 10:05:01 +02:00
parent 55ae54c469 5fde78dcad
commit c8d45a7e97
1 changed files with 3 additions and 1 deletions
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -528,7 +528,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);
@@ -564,6 +564,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;