blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Cleanup: fix compiler warning

This commit is contained in:
Brecht Van Lommel 2021-10-15 23:39:17 +02:00
parent b246f81412
commit fb88ff8f0c
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/render/geometry.cpp
View File

@ -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;
}
}

2
intern/cycles/render/geometry.h
View File

@ -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);

3
intern/cycles/render/mesh_displace.cpp
View File

@ -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()) {