diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-21 05:27:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-21 05:27:38 +0400 |
| commit | a0f25f23010207725afaa92f6b744eaa529484c1 (patch) | |
| tree | 9009a519ee0c115644ee6c05cd62bb41feea2e48 /source/blender/bmesh/intern/bmesh_mods.c | |
| parent | 37242e6b0b1897b3d265a25684eacccfec36ffd0 (diff) | |
Fix own mistake with zealous check for face splitting
Was disallowing adjacent loops to be split which is correct for a single
split across a face, but not fore BM_face_split_n
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 6d8dc531a32..a7e3c12e5d7 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -365,10 +365,10 @@ BMFace *BM_face_split_n(BMesh *bm, BMFace *f, BLI_assert(l_a != l_b); BLI_assert(f == l_a->f && f == l_b->f); - BLI_assert(!BM_loop_is_adjacent(l_a, l_b)); + BLI_assert(!((n == 0) && BM_loop_is_adjacent(l_a, l_b))); /* could be an assert */ - if (UNLIKELY(BM_loop_is_adjacent(l_a, l_b))) { + if (UNLIKELY((n == 0) && BM_loop_is_adjacent(l_a, l_b))) { return NULL; } |