[Bf-blender-cvs] [fe440a92e97] master: Cleanup: compiler warning

Brecht Van Lommel noreply at git.blender.org
Thu Dec 24 14:47:53 CET 2020


Commit: fe440a92e975e8865c281dcbc5326ee73940eb8c
Author: Brecht Van Lommel
Date:   Thu Dec 24 14:19:21 2020 +0100
Branches: master
https://developer.blender.org/rBfe440a92e975e8865c281dcbc5326ee73940eb8c

Cleanup: compiler warning

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

M	intern/cycles/render/object.cpp

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

diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 515f8ba12cf..406982e3ef9 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -369,9 +369,7 @@ ObjectManager::~ObjectManager()
 {
 }
 
-static float object_volume_density(UpdateObjectTransformState *state,
-                                   const Transform &tfm,
-                                   Geometry *geom)
+static float object_volume_density(const Transform &tfm, Geometry *geom)
 {
   if (geom->geometry_type == Geometry::VOLUME) {
     /* Volume density automatically adjust to object scale. */
@@ -405,7 +403,7 @@ void ObjectManager::device_update_object_transform(UpdateObjectTransformState *s
 
   kobject.tfm = tfm;
   kobject.itfm = itfm;
-  kobject.volume_density = object_volume_density(state, tfm, geom);
+  kobject.volume_density = object_volume_density(tfm, geom);
   kobject.color[0] = color.x;
   kobject.color[1] = color.y;
   kobject.color[2] = color.z;



More information about the Bf-blender-cvs mailing list