Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2021-10-26 16:30:12 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-10-26 16:35:31 +0300
commitb698fe1e047e56e8ed67ba47464c0017d9c50eea (patch)
treeced6e1660345c4e1bbe6c65fdf03418448481cbf /intern/cycles/render
parentfd477e738dfd65f7bb0f06c1d91c3259ed26295d (diff)
Cleanup: compiler warnings
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/integrator.cpp2
-rw-r--r--intern/cycles/render/integrator.h2
-rw-r--r--intern/cycles/render/scene.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index 16d9fc60fd3..06fa7339b51 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -270,7 +270,7 @@ void Integrator::tag_update(Scene *scene, uint32_t flag)
}
}
-uint Integrator::get_kernel_features(const Scene *scene) const
+uint Integrator::get_kernel_features() const
{
uint kernel_features = 0;
diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h
index 91efc25e51e..468971986c5 100644
--- a/intern/cycles/render/integrator.h
+++ b/intern/cycles/render/integrator.h
@@ -102,7 +102,7 @@ class Integrator : public Node {
void tag_update(Scene *scene, uint32_t flag);
- uint get_kernel_features(const Scene *scene) const;
+ uint get_kernel_features() const;
AdaptiveSampling get_adaptive_sampling() const;
DenoiseParams get_denoise_params() const;
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 669f5abf7d6..20081677251 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -522,7 +522,7 @@ void Scene::update_kernel_features()
}
kernel_features |= film->get_kernel_features(this);
- kernel_features |= integrator->get_kernel_features(this);
+ kernel_features |= integrator->get_kernel_features();
dscene.data.kernel_features = kernel_features;