blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Volumes: Fix compilation when building without openVDB 

And remove a warning.
This commit is contained in:
Clément Foucault 2020-10-20 15:07:12 +02:00
parent 360282cf1f
commit 257fe5a6e7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/volume.cc
View File

@ -953,6 +953,7 @@ bool BKE_volume_is_points_only(const Volume *volume)
static void volume_update_simplify_level(Volume *volume, const Depsgraph *depsgraph)
{
#ifdef WITH_OPENVDB
const int simplify_level = BKE_volume_simplify_level(depsgraph);
if (volume->runtime.grids) {
for (VolumeGrid &grid : *volume->runtime.grids) {
@ -960,6 +961,9 @@ static void volume_update_simplify_level(Volume *volume, const Depsgraph *depsgr
}
}
volume->runtime.default_simplify_level = simplify_level;
#else
UNUSED_VARS(volume, depsgraph);
#endif
}
static Volume *volume_evaluate_modifiers(struct Depsgraph *depsgraph,
@ -1260,6 +1264,8 @@ VolumeGridType BKE_volume_grid_type(const VolumeGrid *volume_grid)
#ifdef WITH_OPENVDB
const openvdb::GridBase::Ptr grid = volume_grid->grid();
return BKE_volume_grid_type_openvdb(grid);
#else
UNUSED_VARS(volume_grid);
#endif
return VOLUME_GRID_UNKNOWN;
}