Cleanup: fix compiler warnings.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 18 Mar 2019 13:56:08 +0000 (14:56 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 18 Mar 2019 13:56:08 +0000 (14:56 +0100)
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/render/light.cpp
intern/cycles/render/light.h

index 27541800804151f563b3eb580740559591aa4a52..923fdf9be4b27e3a2376f99cbd154fff73d516ef 100644 (file)
@@ -433,7 +433,7 @@ void BlenderSession::render()
                BL::RenderLayer b_rlay = *b_single_rlay;
 
                /* add passes */
-               vector<Pass> passes = sync->sync_render_passes(b_rlay, *b_layer_iter, session_params);
+               vector<Pass> passes = sync->sync_render_passes(b_rlay, *b_layer_iter);
                buffer_params.passes = passes;
 
                PointerRNA crl = RNA_pointer_get(&b_layer_iter->ptr, "cycles");
index c595e0364c6754c3f43e2e5e210ac41c18f82168..841af87000fda7991c1b15b87e26d10e6c1f90cb 100644 (file)
@@ -553,8 +553,7 @@ int BlenderSync::get_denoising_pass(BL::RenderPass& b_pass)
 }
 
 vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer& b_rlay,
-                                             BL::SceneRenderLayer& b_srlay,
-                                             const SessionParams &session_params)
+                                             BL::SceneRenderLayer& b_srlay)
 {
        vector<Pass> passes;
        Pass::add(PASS_COMBINED, passes);
index 6d78f62c7d090423bff68589f95a2bd896e3a667..4541fa177386cc1443326028d88e4af51107633a 100644 (file)
@@ -67,8 +67,7 @@ public:
                       const char *layer = 0);
        void sync_render_layers(BL::SpaceView3D& b_v3d, const char *layer);
        vector<Pass> sync_render_passes(BL::RenderLayer& b_rlay,
-                                       BL::SceneRenderLayer& b_srlay,
-                                       const SessionParams &session_params);
+                                       BL::SceneRenderLayer& b_srlay);
        void sync_integrator();
        void sync_camera(BL::RenderSettings& b_render,
                         BL::Object& b_override,
index 7101d2ab60c9c6a3d158ade8996e70941718c6fd..7439f82790d5ce215aa9b56ff7e87c182f41de7e 100644 (file)
@@ -191,7 +191,7 @@ bool LightManager::has_background_light(Scene *scene)
        return false;
 }
 
-void LightManager::disable_ineffective_light(Device * /*device*/, Scene *scene)
+void LightManager::disable_ineffective_light(Scene *scene)
 {
        /* Make all lights enabled by default, and perform some preliminary checks
         * needed for finer-tuning of settings (for example, check whether we've
@@ -873,7 +873,7 @@ void LightManager::device_update(Device *device, DeviceScene *dscene, Scene *sce
 
        use_light_visibility = false;
 
-       disable_ineffective_light(device, scene);
+       disable_ineffective_light(scene);
 
        device_update_points(device, dscene, scene);
        if(progress.get_cancel()) return;
index f4dfe0cadbf69667d438a045f19ddc4636f9658d..e7c06604fc4c1ed15ec661662633b60ee89ed02f 100644 (file)
@@ -109,7 +109,7 @@ protected:
         * which doesn't contribute to the scene or which is only used for MIS
         * and scene doesn't need MIS.
         */
-       void disable_ineffective_light(Device *device, Scene *scene);
+       void disable_ineffective_light(Scene *scene);
 
        void device_update_points(Device *device,
                                  DeviceScene *dscene,