[Bf-blender-cvs] [fb88ff8f0c7] master: Cleanup: fix compiler warning

[Brecht Van Lommel]

Commit: fb88ff8f0c72be410c12a2f3b0226949d5041448
Author: Brecht Van Lommel
Date:   Fri Oct 15 23:39:17 2021 +0200
Branches: master
https://developer.blender.org/rBfb88ff8f0c72be410c12a2f3b0226949d5041448

Cleanup: fix compiler warning

===================================================================

M	intern/cycles/render/geometry.cpp
M	intern/cycles/render/geometry.h
M	intern/cycles/render/mesh_displace.cpp

===================================================================

diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index 0304f168187..5d89060c1a1 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -1813,7 +1813,7 @@ void GeometryManager::device_update(Device *device,
       if (geom->is_modified()) {
         if (geom->is_mesh()) {
           Mesh *mesh = static_cast<Mesh *>(geom);
-          if (displace(device, dscene, scene, mesh, progress)) {
+          if (displace(device, scene, mesh, progress)) {
             displacement_done = true;
           }
         }
diff --git a/intern/cycles/render/geometry.h b/intern/cycles/render/geometry.h
index cd42f62c669..5c45754ad90 100644
--- a/intern/cycles/render/geometry.h
+++ b/intern/cycles/render/geometry.h
@@ -219,7 +219,7 @@ class GeometryManager {
   void collect_statistics(const Scene *scene, RenderStats *stats);
 
  protected:
-  bool displace(Device *device, DeviceScene *dscene, Scene *scene, Mesh *mesh, Progress &progress);
+  bool displace(Device *device, Scene *scene, Mesh *mesh, Progress &progress);
 
   void create_volume_mesh(Volume *volume, Progress &progress);
 
diff --git a/intern/cycles/render/mesh_displace.cpp b/intern/cycles/render/mesh_displace.cpp
index a08874e6fa8..3a11f39d977 100644
--- a/intern/cycles/render/mesh_displace.cpp
+++ b/intern/cycles/render/mesh_displace.cpp
@@ -163,8 +163,7 @@ static void read_shader_output(const Scene *scene,
   }
 }
 
-bool GeometryManager::displace(
-    Device *device, DeviceScene *dscene, Scene *scene, Mesh *mesh, Progress &progress)
+bool GeometryManager::displace(Device *device, Scene *scene, Mesh *mesh, Progress &progress)
 {
   /* verify if we have a displacement shader */
   if (!mesh->has_true_displacement()) {