Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r--source/blender/bmesh/intern/bmesh_marking.c4
-rw-r--r--source/blender/bmesh/intern/bmesh_walkers_impl.c12
-rw-r--r--source/blender/bmesh/tools/bmesh_bevel.c2
-rw-r--r--source/blender/bmesh/tools/bmesh_bisect_plane.c2
-rw-r--r--source/blender/bmesh/tools/bmesh_edgenet.c6
-rw-r--r--source/blender/bmesh/tools/bmesh_edgesplit.c2
6 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c
index 0a6c0f4b293..2f05d901d27 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -167,8 +167,8 @@ void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode)
{
BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
- BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
- !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
+ BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
+ !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
{
BM_elem_flag_enable(e, BM_ELEM_SELECT);
}
diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c
index aca2f96dc18..4cf252e76e8 100644
--- a/source/blender/bmesh/intern/bmesh_walkers_impl.c
+++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c
@@ -641,12 +641,12 @@ static void *bmw_LoopWalker_step(BMWalker *walker)
/* check if we should step, this is fairly involved */
if (
- /* walk over boundary of faces but stop at corners */
- (owalk.is_single == false && vert_edge_tot > 2) ||
+ /* walk over boundary of faces but stop at corners */
+ (owalk.is_single == false && vert_edge_tot > 2) ||
- /* initial edge was a boundary, so is this edge and vertex is only apart of this face
- * this lets us walk over the the boundary of an ngon which is handy */
- (owalk.is_single == true && vert_edge_tot == 2 && BM_edge_is_boundary(e)))
+ /* initial edge was a boundary, so is this edge and vertex is only apart of this face
+ * this lets us walk over the the boundary of an ngon which is handy */
+ (owalk.is_single == true && vert_edge_tot == 2 && BM_edge_is_boundary(e)))
{
/* find next boundary edge in the fan */
do {
@@ -932,7 +932,7 @@ static void *bmw_EdgeringWalker_step(BMWalker *walker)
}
if ((len <= 0) || (len % 2 != 0) || !EDGE_CHECK(l->e) ||
- !bmw_mask_check_face(walker, l->f))
+ !bmw_mask_check_face(walker, l->f))
{
l = owalk.l;
i = len;
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 0024e17f974..71bb5834351 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -2436,7 +2436,7 @@ static bool tri_corner_test(BevelParams *bp, BevVert *bv)
totang += ang;
}
angdiff = fabsf(totang - 3.0f * (float)M_PI_2);
- if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI/16.0f) ||
+ if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI / 16.0f) ||
(angdiff > (float)M_PI_4))
{
return false;
diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c
index 7001cfa4061..7a33dc40f8e 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.c
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c
@@ -248,7 +248,7 @@ static void bm_face_bisect_verts(BMesh *bm, BMFace *f, const float plane[4], con
/* would be nice to avoid loop lookup here,
* but we need to know which face the verts are in */
if ((l_a = BM_face_vert_share_loop(face_split_arr[j], v_a)) &&
- (l_b = BM_face_vert_share_loop(face_split_arr[j], v_b)))
+ (l_b = BM_face_vert_share_loop(face_split_arr[j], v_b)))
{
found = true;
break;
diff --git a/source/blender/bmesh/tools/bmesh_edgenet.c b/source/blender/bmesh/tools/bmesh_edgenet.c
index 14d474fed61..3b70d0e6406 100644
--- a/source/blender/bmesh/tools/bmesh_edgenet.c
+++ b/source/blender/bmesh/tools/bmesh_edgenet.c
@@ -221,7 +221,7 @@ static BMEdge *bm_edgenet_path_step(
if (vn_curr->pass == -vn_next->pass) {
if ((vn_curr->flag & VNINFO_FLAG_IS_MIXFACE) ||
- (vn_next->flag & VNINFO_FLAG_IS_MIXFACE))
+ (vn_next->flag & VNINFO_FLAG_IS_MIXFACE))
{
/* found connecting edge */
if (bm_edgenet_path_check_overlap(v_curr, v_next, vnet_info) == false) {
@@ -237,8 +237,8 @@ static BMEdge *bm_edgenet_path_step(
/* flush flag down the path */
vn_next->flag &= ~VNINFO_FLAG_IS_MIXFACE;
if ((vn_curr->flag & VNINFO_FLAG_IS_MIXFACE) ||
- (vn_next->face == -1) ||
- (vn_next->face != vn_curr->face))
+ (vn_next->face == -1) ||
+ (vn_next->face != vn_curr->face))
{
vn_next->flag |= VNINFO_FLAG_IS_MIXFACE;
}
diff --git a/source/blender/bmesh/tools/bmesh_edgesplit.c b/source/blender/bmesh/tools/bmesh_edgesplit.c
index 412253aafe9..947b77675d8 100644
--- a/source/blender/bmesh/tools/bmesh_edgesplit.c
+++ b/source/blender/bmesh/tools/bmesh_edgesplit.c
@@ -88,7 +88,7 @@ static void bm_edgesplit_validate_seams(BMesh *bm)
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
if (vtouch[BM_elem_index_get(e->v1)] == 1 &&
- vtouch[BM_elem_index_get(e->v2)] == 1)
+ vtouch[BM_elem_index_get(e->v2)] == 1)
{
BM_elem_flag_disable(e, BM_ELEM_TAG);
}