[Bf-blender-cvs] [d42c085] master: Fix T41517: BMesh intersect crash

[Campbell Barton]

Commit: d42c085516ac0e8d74a839c5b1fb114caa18d3a0
Author: Campbell Barton
Date:   Thu Aug 21 09:22:12 2014 +1000
Branches: master
https://developer.blender.org/rBd42c085516ac0e8d74a839c5b1fb114caa18d3a0

Fix T41517: BMesh intersect crash

===================================================================

M	source/blender/bmesh/tools/bmesh_intersect.c

===================================================================

diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c
index 9cf38bb..4d87c3e 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]));
 						}
 					}
 				}