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/modifiers | |
| parent | f38c2fbef99d93721feec8819513b63c91ac796a (diff) | |
| parent | 05697470ab0dde6646be939ae57a95c9d4099e0b (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_volume_displace.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc index 3e71d1fb106..5ce76046294 100644 --- a/source/blender/modifiers/intern/MOD_volume_displace.cc +++ b/source/blender/modifiers/intern/MOD_volume_displace.cc @@ -189,10 +189,8 @@ struct DisplaceGridOp { template<typename GridType> void operator()() { - if constexpr (blender::is_same_any_v<GridType, - openvdb::points::PointDataGrid, - openvdb::StringGrid, - openvdb::MaskGrid>) { + if constexpr (blender:: + is_same_any_v<GridType, openvdb::points::PointDataGrid, openvdb::MaskGrid>) { /* We don't support displacing these grid types yet. */ return; } |