diff options
| author | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
| commit | 7246c387435769a169ac24c91434c615df6434b4 (patch) | |
| tree | 61842e3e0ce85e80720fdd7476d44d2e629f59fd /source/blender/bmesh/intern/bmesh_mods.c | |
| parent | c5f55d17096d373791363e46004176e3f7f7ae52 (diff) | |
| parent | 0b4bd3ddc016298e868169a541cf6c132b10c587 (diff) | |
Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_mods.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 8b56e08c22b..a1842b598d5 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -62,7 +62,7 @@ bool BM_disk_dissolve(BMesh *bm, BMVert *v) e = v->e; do { e = bmesh_disk_edge_next(e, v); - if (!(BM_edge_share_face_check(e, v->e))) { + if (!BM_edge_share_face_check(e, v->e)) { keepedge = e; baseedge = v->e; break; @@ -192,7 +192,7 @@ BMFace *BM_face_split(BMesh *bm, BLI_assert(!BM_loop_is_adjacent(l_a, l_b)); /* could be an assert */ - if (UNLIKELY(BM_loop_is_adjacent(l_a, l_b)) || UNLIKELY((f != l_a->f || f != l_b->f))) { + if (UNLIKELY(BM_loop_is_adjacent(l_a, l_b)) || UNLIKELY(f != l_a->f || f != l_b->f)) { if (r_l) { *r_l = NULL; } |