archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T48012: Knife Project crash

Browse Source
This commit is contained in:
Campbell Barton
2016-04-01 06:22:30 +11:00
parent 553ea6de8b
commit 83b5f0268e
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/bmesh/intern/bmesh_polygon_edgenet.c
View File

@@ -1485,12 +1485,26 @@ finally:
#ifdef USE_PARTIAL_CONNECT
/* don't free 'vert_temp_pair_list', its part of the arena */
if (use_partial_connect) {
/* Sanity check: ensure we don't have connecting edges before splicing begins. */
#ifdef DEBUG
{
struct TempVertPair *tvp = temp_vert_pairs.list;
do {
/* we must _never_ create connections here
* (inface the islands can't have a connection at all) */
BLI_assert(BM_edge_exists(tvp->v_orig, tvp->v_temp) == NULL);
} while ((tvp = tvp->next));
}
#endif
struct TempVertPair *tvp = temp_vert_pairs.list;
do {
/* we must _never_ create connections here
* (inface the islands can't have a connection at all) */
BLI_assert(BM_edge_exists(tvp->v_orig, tvp->v_temp) == NULL);
BM_vert_splice(bm, tvp->v_orig, tvp->v_temp);
/* its _very_ unlikely the edge exists,
* however splicing may case this. see: T48012 */
if (!BM_edge_exists(tvp->v_orig, tvp->v_temp)) {
BM_vert_splice(bm, tvp->v_orig, tvp->v_temp);
}
} while ((tvp = tvp->next));
/* Remove edges which have become doubles since splicing vertices together,