diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2022-02-16 21:51:58 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2022-02-16 21:51:58 +0300 |
commit | 57013e2a44e974d307f08f41793d810a49537f96 (patch) | |
tree | 0e60059fc9d3f2809590dec364f524b5e3484a6e /source/blender/blenkernel/intern/volume.cc | |
parent | f38c2fbef99d93721feec8819513b63c91ac796a (diff) | |
parent | 05697470ab0dde6646be939ae57a95c9d4099e0b (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/blenkernel/intern/volume.cc')
-rw-r--r-- | source/blender/blenkernel/intern/volume.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index ff3f20479f8..07db0328f56 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -1331,9 +1331,6 @@ VolumeGridType BKE_volume_grid_type_openvdb(const openvdb::GridBase &grid) if (grid.isType<openvdb::Vec3dGrid>()) { return VOLUME_GRID_VECTOR_DOUBLE; } - if (grid.isType<openvdb::StringGrid>()) { - return VOLUME_GRID_STRING; - } if (grid.isType<openvdb::MaskGrid>()) { return VOLUME_GRID_MASK; } @@ -1369,7 +1366,6 @@ int BKE_volume_grid_channels(const VolumeGrid *grid) case VOLUME_GRID_VECTOR_DOUBLE: case VOLUME_GRID_VECTOR_INT: return 3; - case VOLUME_GRID_STRING: case VOLUME_GRID_POINTS: case VOLUME_GRID_UNKNOWN: return 0; @@ -1610,13 +1606,8 @@ struct CreateGridWithChangedResolutionOp { template<typename GridType> typename openvdb::GridBase::Ptr operator()() { - if constexpr (std::is_same_v<GridType, openvdb::StringGrid>) { - return {}; - } - else { - return create_grid_with_changed_resolution(static_cast<const GridType &>(grid), - resolution_factor); - } + return create_grid_with_changed_resolution(static_cast<const GridType &>(grid), + resolution_factor); } }; |