diff options
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 14 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 3 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers_impl.c | 3 |
3 files changed, 7 insertions, 13 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index bd86f49cdc3..bf19be1a965 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -800,13 +800,13 @@ void BM_edge_kill(BMesh *bm, BMEdge *e) void BM_vert_kill(BMesh *bm, BMVert *v) { if (v->e) { - BMEdge *e, *nexte; + BMEdge *e, *e_next; e = v->e; while (v->e) { - nexte = bmesh_disk_edge_next(e, v); + e_next = bmesh_disk_edge_next(e, v); BM_edge_kill(bm, e); - e = nexte; + e = e_next; } } @@ -1023,12 +1023,8 @@ static bool disk_is_flagged(BMVert *v, int flag) do { if (!BM_ELEM_API_FLAG_TEST(l->f, flag)) return false; - - l = l->radial_next; - } while (l != e->l); - - e = bmesh_disk_edge_next(e, v); - } while (e != v->e); + } while ((l = l->radial_next) != e->l); + } while ((e = bmesh_disk_edge_next(e, v)) != v->e); return true; } diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 3b639314a89..f6b91d80349 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -192,8 +192,7 @@ bool BM_disk_dissolve(BMesh *bm, BMVert *v) done = false; break; } - e = bmesh_disk_edge_next(e, v); - } while (e != v->e); + } while ((e = bmesh_disk_edge_next(e, v)) != v->e); } /* collapse the vertex */ diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index ee0e35b1013..d530980f020 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -211,8 +211,7 @@ static void *bmw_ShellWalker_step(BMWalker *walker) newState->curedge = curedge; } } - curedge = bmesh_disk_edge_next(curedge, shellWalk.base); - } while (curedge != shellWalk.curedge); + } while ((curedge = bmesh_disk_edge_next(curedge, shellWalk.base)) != shellWalk.curedge); return shellWalk.curedge; } |