diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 13:30:43 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 14:38:06 +0300 |
commit | 1b272a649b40e99dba4185167f6cee7cbece1942 (patch) | |
tree | 2785f52c566b36cbdcbf9355f698dc520ffbb482 /source/blender/blenkernel/intern/volume.cc | |
parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) |
Cleanup: Blenkernel, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/blenkernel` module.
No functional changes.
Diffstat (limited to 'source/blender/blenkernel/intern/volume.cc')
-rw-r--r-- | source/blender/blenkernel/intern/volume.cc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 633ad250a67..54fb0f612d1 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -367,9 +367,8 @@ struct VolumeGrid { if (is_loaded && entry && !entry->error_msg.empty()) { return entry->error_msg.c_str(); } - else { - return NULL; - } + + return NULL; } const bool grid_is_loaded() const @@ -1087,34 +1086,34 @@ VolumeGridType BKE_volume_grid_type(const VolumeGrid *volume_grid) if (grid->isType<openvdb::FloatGrid>()) { return VOLUME_GRID_FLOAT; } - else if (grid->isType<openvdb::Vec3fGrid>()) { + if (grid->isType<openvdb::Vec3fGrid>()) { return VOLUME_GRID_VECTOR_FLOAT; } - else if (grid->isType<openvdb::BoolGrid>()) { + if (grid->isType<openvdb::BoolGrid>()) { return VOLUME_GRID_BOOLEAN; } - else if (grid->isType<openvdb::DoubleGrid>()) { + if (grid->isType<openvdb::DoubleGrid>()) { return VOLUME_GRID_DOUBLE; } - else if (grid->isType<openvdb::Int32Grid>()) { + if (grid->isType<openvdb::Int32Grid>()) { return VOLUME_GRID_INT; } - else if (grid->isType<openvdb::Int64Grid>()) { + if (grid->isType<openvdb::Int64Grid>()) { return VOLUME_GRID_INT64; } - else if (grid->isType<openvdb::Vec3IGrid>()) { + if (grid->isType<openvdb::Vec3IGrid>()) { return VOLUME_GRID_VECTOR_INT; } - else if (grid->isType<openvdb::Vec3dGrid>()) { + if (grid->isType<openvdb::Vec3dGrid>()) { return VOLUME_GRID_VECTOR_DOUBLE; } - else if (grid->isType<openvdb::StringGrid>()) { + if (grid->isType<openvdb::StringGrid>()) { return VOLUME_GRID_STRING; } - else if (grid->isType<openvdb::MaskGrid>()) { + if (grid->isType<openvdb::MaskGrid>()) { return VOLUME_GRID_MASK; } - else if (grid->isType<openvdb::points::PointDataGrid>()) { + if (grid->isType<openvdb::points::PointDataGrid>()) { return VOLUME_GRID_POINTS; } #else |