Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 4 May 2017 08:05:01 +0000 (10:05 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 4 May 2017 08:05:01 +0000 (10:05 +0200)
intern/cycles/blender/blender_sync.cpp

index 08120a2ca28c02088a88d1f5eed570bc0203ae9e..a2d865f919384bab82be738ecceafa619dbf7ec5 100644 (file)
@@ -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;