diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-08-27 10:29:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-08-27 10:29:05 +0300 |
| commit | 7652ee43ecbdbdfe3c873023ab52ef6a6436d889 (patch) | |
| tree | a67cd004f420d4ea79644e1efe311a04d11a214a /source/blender/modifiers/intern/MOD_mask.cc | |
| parent | 89dae554f9d5ae0204ad9c51c5ba00e14b16e858 (diff) | |
Cleanup: clang-tidy
Diffstat (limited to 'source/blender/modifiers/intern/MOD_mask.cc')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_mask.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index aca90e0533c..306e79aa647 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -432,7 +432,7 @@ static void add_interp_verts_copy_edges_to_new_mesh(const Mesh &src_mesh, float weights[2] = {1.0f - fac, fac}; CustomData_interp( - &src_mesh.vdata, &dst_mesh.vdata, (int *)&e_src.v1, weights, NULL, 2, vert_index); + &src_mesh.vdata, &dst_mesh.vdata, (int *)&e_src.v1, weights, nullptr, 2, vert_index); MVert &v = dst_mesh.mvert[vert_index]; MVert &v1 = src_mesh.mvert[e_src.v1]; MVert &v2 = src_mesh.mvert[e_src.v2]; @@ -589,7 +589,7 @@ static void add_interpolated_polys_to_new_mesh(const Mesh &src_mesh, start = j; break; } - else if (!skip) { + if (!skip) { skip = true; } } @@ -615,7 +615,8 @@ static void add_interpolated_polys_to_new_mesh(const Mesh &src_mesh, dvert, defgrp_index, threshold, last_loop->v, loop.v); float weights[2] = {1.0f - fac, fac}; int indices[2] = {i_ml_src + last_index, i_ml_src + index}; - CustomData_interp(&src_mesh.ldata, &dst_mesh.ldata, indices, weights, NULL, 2, i_ml_dst); + CustomData_interp( + &src_mesh.ldata, &dst_mesh.ldata, indices, weights, nullptr, 2, i_ml_dst); MLoop &cut_dst_loop = dst_mesh.mloop[i_ml_dst]; cut_dst_loop.e = edge_map[last_loop->e]; cut_dst_loop.v = dst_mesh.medge[cut_dst_loop.e].v1; @@ -634,7 +635,8 @@ static void add_interpolated_polys_to_new_mesh(const Mesh &src_mesh, dvert, defgrp_index, threshold, last_loop->v, loop.v); float weights[2] = {1.0f - fac, fac}; int indices[2] = {i_ml_src + last_index, i_ml_src + index}; - CustomData_interp(&src_mesh.ldata, &dst_mesh.ldata, indices, weights, NULL, 2, i_ml_dst); + CustomData_interp( + &src_mesh.ldata, &dst_mesh.ldata, indices, weights, nullptr, 2, i_ml_dst); MLoop &cut_dst_loop = dst_mesh.mloop[i_ml_dst]; cut_dst_loop.e = edge_index; cut_dst_loop.v = dst_mesh.medge[edge_map[last_loop->e]].v1; |