diff options
author | Jacques Lucke <jacques@blender.org> | 2020-11-09 14:05:07 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-11-09 14:05:07 +0300 |
commit | 525a042c5c7513c41240b118acca002f6c60cc12 (patch) | |
tree | b1c20d68ee73d178d94ea3ef026a31c072157a4f | |
parent | 5837ffc143e6fff055ab159335f6f605f0418b34 (diff) |
Cleanup: fix some clang tidy issues
-rw-r--r-- | source/blender/blenlib/intern/mesh_intersect.cc | 9 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_boolean.cc | 3 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc | 8 |
3 files changed, 8 insertions, 12 deletions
diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index fffc88525c1..58f78be13b6 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -519,7 +519,7 @@ class IMeshArena::IMeshArenaImpl : NonCopyable, NonMovable { IMeshArena::IMeshArena() { - pimpl_ = std::unique_ptr<IMeshArenaImpl>(new IMeshArenaImpl()); + pimpl_ = std::make_unique<IMeshArenaImpl>(); } IMeshArena::~IMeshArena() @@ -2022,12 +2022,12 @@ class TriOverlaps { if (two_trees_no_self) { BLI_bvhtree_balance(tree_b_); /* Don't expect a lot of trivial intersects in this case. */ - overlap_ = BLI_bvhtree_overlap(tree_, tree_b_, &overlap_tot_, NULL, NULL); + overlap_ = BLI_bvhtree_overlap(tree_, tree_b_, &overlap_tot_, nullptr, nullptr); } else { CBData cbdata{tm, shape_fn, nshapes, use_self}; if (nshapes == 1) { - overlap_ = BLI_bvhtree_overlap(tree_, tree_, &overlap_tot_, NULL, NULL); + overlap_ = BLI_bvhtree_overlap(tree_, tree_, &overlap_tot_, nullptr, nullptr); } else { overlap_ = BLI_bvhtree_overlap( @@ -2199,8 +2199,7 @@ struct SubdivideTrisData { tm(tm), itt_map(itt_map), overlap(overlap), - arena(arena), - overlap_tri_range{} + arena(arena) { } }; diff --git a/source/blender/bmesh/tools/bmesh_boolean.cc b/source/blender/bmesh/tools/bmesh_boolean.cc index 4a36db3b353..929bc510672 100644 --- a/source/blender/bmesh/tools/bmesh_boolean.cc +++ b/source/blender/bmesh/tools/bmesh_boolean.cc @@ -119,7 +119,8 @@ static bool bmvert_attached_to_wire(const BMVert *bmv) static bool bmvert_attached_to_hidden_face(BMVert *bmv) { BMIter iter; - for (BMFace *bmf = static_cast<BMFace *>(BM_iter_new(&iter, NULL, BM_FACES_OF_VERT, bmv)); bmf; + for (BMFace *bmf = static_cast<BMFace *>(BM_iter_new(&iter, nullptr, BM_FACES_OF_VERT, bmv)); + bmf; bmf = static_cast<BMFace *>(BM_iter_step(&iter))) { if (BM_elem_flag_test(bmf, BM_ELEM_HIDDEN)) { return true; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc index c91dda87190..b7a5aa7c171 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc @@ -25,9 +25,7 @@ #include "testing/testing.h" -namespace blender { -namespace deg { -namespace tests { +namespace blender::deg::tests { class TestableRNANodeQuery : public RNANodeQuery { public: @@ -55,6 +53,4 @@ TEST(deg_builder_rna, contains) EXPECT_FALSE(TestableRNANodeQuery::contains("pose.bone[\"location\"].scale[0]", "location")); } -} // namespace tests -} // namespace deg -} // namespace blender +} // namespace blender::deg::tests |