archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: compiler warning

Browse Source
This commit is contained in:
Brecht Van Lommel
2020-12-24 14:19:21 +01:00
parent 29cd99e7fd
commit fe440a92e9
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/render/object.cpp
View File

@@ -369,9 +369,7 @@ ObjectManager::~ObjectManager()
{ {
} }
static float object_volume_density(UpdateObjectTransformState *state, static float object_volume_density(const Transform &tfm, Geometry *geom)
const Transform &tfm,
Geometry *geom)
{ {
if (geom->geometry_type == Geometry::VOLUME) { if (geom->geometry_type == Geometry::VOLUME) {
/* Volume density automatically adjust to object scale. */ /* Volume density automatically adjust to object scale. */
@@ -405,7 +403,7 @@ void ObjectManager::device_update_object_transform(UpdateObjectTransformState *s
kobject.tfm = tfm; kobject.tfm = tfm;
kobject.itfm = itfm; 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[0] = color.x;
kobject.color[1] = color.y; kobject.color[1] = color.y;
kobject.color[2] = color.z; kobject.color[2] = color.z;