blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

error in last commit

This commit is contained in:
Campbell Barton 2015-01-14 04:57:35 +11:00
parent 3f0113be4d
commit ef80914c99
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/mesh/editmesh_knife.c
View File

@ -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;