Commit: ef80914c99fb94a4bc7e02a1f808eb0162577fec
Author: Campbell Barton
Date: Wed Jan 14 04:57:35 2015 +1100
Branches: master
https://developer.blender.org/rBef80914c99fb94a4bc7e02a1f808eb0162577fec
error in last commit
===================================================================
M source/blender/editors/mesh/editmesh_knife.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_knife.c
b/source/blender/editors/mesh/editmesh_knife.c
index 093ad02..0a78f29 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
