diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-13 20:57:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-13 21:11:19 +0300 |
| commit | ef80914c99fb94a4bc7e02a1f808eb0162577fec (patch) | |
| tree | e8b89c97add9d3ff7e3d6b8eb682dbf775442644 /source/blender/editors/mesh/editmesh_knife.c | |
| parent | 3f0113be4ddb75e1e4dd159e58112e8c45ebdb12 (diff) | |
error in last commit
Diffstat (limited to 'source/blender/editors/mesh/editmesh_knife.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 093ad02b2da..0a78f299159 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1232,6 +1232,9 @@ static BMElem *bm_elem_from_knife_vert(KnifeVert *kfv, KnifeEdge **r_kfe) BMElem *ele_test; KnifeEdge *kfe = NULL; + /* vert? */ + ele_test = (BMElem *)kfv->v; + if (r_kfe || ele_test == NULL) { if (kfv->v == NULL) { Ref *ref; @@ -1245,9 +1248,6 @@ static BMElem *bm_elem_from_knife_vert(KnifeVert *kfv, KnifeEdge **r_kfe) } } - /* vert? */ - ele_test = (BMElem *)kfv->v; - /* edge? */ if (ele_test == NULL) { if (kfe) { @@ -1255,6 +1255,7 @@ static BMElem *bm_elem_from_knife_vert(KnifeVert *kfv, KnifeEdge **r_kfe) } } + /* face? */ if (ele_test == NULL) { if (BLI_listbase_is_single(&kfe->faces)) { ele_test = ((Ref *)kfe->faces.first)->ref; |