diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-02-17 18:14:49 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-02-17 18:14:49 +0300 |
| commit | 5b64e59b76ecb00934d540729698da02b322250d (patch) | |
| tree | 8f2b1a4acf2d3f9ade35b351b40bbe4c21d5beab /source/blender/modifiers/intern | |
| parent | f43ccc010d0c1a1f4d860c81c70b48f23fbca2b3 (diff) | |
| parent | 6a283b7a7f4344fb10fbac54258e9c5b1da0c1ad (diff) | |
Merge branch 'master' into temp-abc-features
Diffstat (limited to 'source/blender/modifiers/intern')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshsequencecache.cc | 4 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_volume_displace.cc | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc index dccb09eaf9d..65f86c2e6c4 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc @@ -494,10 +494,6 @@ static void render_procedural_panel_draw(const bContext *C, Panel *panel) return; } - if (RNA_pointer_is_null(&fileptr)) { - return; - } - uiLayoutSetPropSep(layout, true); uiTemplateCacheFileProcedural(layout, C, &fileptr); } 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; } |