diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2013-09-19 17:35:43 +0400 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2013-09-19 17:35:43 +0400 |
| commit | 7d7adf44882f9780973b35cab6ba185b2972aa0c (patch) | |
| tree | e3e0f7826778ff8978442729469cff1cbac2d563 /source | |
| parent | 67fa1a57ba953c749dac526104b4b185ab027476 (diff) | |
Prevent assert failure in knife.
It seems sometimes a knife edge with the same
vertex on both ends was created sometimes.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 5051a5ac259..ea974fc76f5 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -497,7 +497,7 @@ static KnifeVert *knife_split_edge(KnifeTool_OpData *kcd, KnifeEdge *kfe, float * and move cur data to prev. */ static void knife_add_single_cut(KnifeTool_OpData *kcd) { - KnifeEdge *kfe = new_knife_edge(kcd), *kfe2 = NULL, *kfe3 = NULL; + KnifeEdge *kfe, *kfe2 = NULL, *kfe3 = NULL; if ((kcd->prev.vert && kcd->prev.vert == kcd->curr.vert) || (kcd->prev.edge && kcd->prev.edge == kcd->curr.edge)) @@ -506,6 +506,7 @@ static void knife_add_single_cut(KnifeTool_OpData *kcd) return; } + kfe = new_knife_edge(kcd); kfe->draw = true; if (kcd->prev.vert) { @@ -2738,7 +2739,7 @@ static void knife_make_chain_cut(KnifeTool_OpData *kcd, BMFace *f, ListBase *cha l_new = NULL; if (nco == 0) { /* Want to prevent creating two-sided polygons */ - if (BM_edge_exists(v1, v2)) { + if (v1 == v2 || BM_edge_exists(v1, v2)) { f_new = NULL; } else { |