Commit: 8162a6c51d28b09791977c9009f79b9a204bb346
Author: Brecht Van Lommel
Date: Mon Mar 18 14:56:08 2019 +0100
Branches: blender2.7
https://developer.blender.org/rB8162a6c51d28b09791977c9009f79b9a204bb346
Cleanup: fix compiler warnings.
===================================================================
M intern/cycles/blender/blender_session.cpp
M intern/cycles/blender/blender_sync.cpp
M intern/cycles/blender/blender_sync.h
M intern/cycles/render/light.cpp
M intern/cycles/render/light.h
===================================================================
diff --git a/intern/cycles/blender/blender_session.cpp
b/intern/cycles/blender/blender_session.cpp
index 27541800804..923fdf9be4b 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -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");
diff --git a/intern/cycles/blender/blender_sync.cpp
b/intern/cycles/blender/blender_sync.cpp
index c595e0364c6..841af87000f 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -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);
diff --git a/intern/cycles/blender/blender_sync.h
b/intern/cycles/blender/blender_sync.h
index 6d78f62c7d0..4541fa17738 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -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,
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index 7101d2ab60c..7439f82790d 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -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;
diff --git a/intern/cycles/render/light.h b/intern/cycles/render/light.h
index f4dfe0cadbf..e7c06604fc4 100644
--- a/intern/cycles/render/light.h
+++ b/intern/cycles/render/light.h
@@ -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,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
