diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-08-21 03:22:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-21 03:23:07 +0400 |
| commit | d42c085516ac0e8d74a839c5b1fb114caa18d3a0 (patch) | |
| tree | a5952129c99147f89ba48528182433ad09f23cb1 /source/blender/bmesh | |
| parent | d93c07d987d12489b36e6f53a235cf575df6b8d0 (diff) | |
Fix T41517: BMesh intersect crash
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index 9cf38bb144e..4d87c3e3551 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -1223,8 +1223,10 @@ bool BM_mesh_intersect( if (!BLI_gset_haskey(verts_invalid, splice_ls[i][0]) && !BLI_gset_haskey(verts_invalid, splice_ls[i][1])) { - if (!BM_vert_splice_check_double(splice_ls[i][0], splice_ls[i][1])) { - BM_vert_splice(bm, splice_ls[i][0], splice_ls[i][1]); + if (!BM_edge_exists(UNPACK2(splice_ls[i])) && + !BM_vert_splice_check_double(UNPACK2(splice_ls[i]))) + { + BM_vert_splice(bm, UNPACK2(splice_ls[i])); } } } |