Commit: 77c3ecf88c3109e5a6b14f6e064fe1a88644bab6
Author: Campbell Barton
Date: Sat Dec 26 14:26:30 2015 +1100
Branches: master
https://developer.blender.org/rB77c3ecf88c3109e5a6b14f6e064fe1a88644bab6
BMesh: check at least 2 edges in each loops vert
Also no need to check twice
===================================================================
M source/blender/bmesh/intern/bmesh_core.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_core.c
b/source/blender/bmesh/intern/bmesh_core.c
index 29178c2..b166d60 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -683,7 +683,7 @@ int bmesh_elem_check(void *element, const char htype)
err |=
IS_FACE_LOOP_WRONG_RADIAL_LENGTH;
}
- if (!bmesh_disk_count(l_iter->v) ||
!bmesh_disk_count(l_iter->next->v)) {
+ if (bmesh_disk_count_ex(l_iter->v, 2) <
2) {
err |=
IS_FACE_LOOP_WRONG_DISK_LENGTH;
}
}
@@ -937,9 +937,6 @@ void BM_face_kill_loose(BMesh *bm, BMFace *f)
void BM_edge_kill(BMesh *bm, BMEdge *e)
{
- bmesh_disk_edge_remove(e, e->v1);
- bmesh_disk_edge_remove(e, e->v2);
-
if (e->l) {
BMLoop *l = e->l, *lnext, *startl = e->l;
@@ -957,6 +954,9 @@ void BM_edge_kill(BMesh *bm, BMEdge *e)
l = lnext;
} while (l != startl);
}
+
+ bmesh_disk_edge_remove(e, e->v1);
+ bmesh_disk_edge_remove(e, e->v2);
bm_kill_only_edge(bm, e);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
