forked from bartvdbraak/blender
Cleanup: fix compiler warning
This commit is contained in:
parent
b246f81412
commit
fb88ff8f0c
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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()) {
|
||||
|
Loading…
Reference in New Issue
Block a user