[Bf-blender-cvs] [e1ecd39] master: BMesh: avoid over-counting vert-edges

[Campbell Barton]

Commit: e1ecd39f0ee2ce1139045c83b8f5e415c346570f
Author: Campbell Barton
Date:   Wed Apr 29 10:25:59 2015 +1000
Branches: master
https://developer.blender.org/rBe1ecd39f0ee2ce1139045c83b8f5e415c346570f

BMesh: avoid over-counting vert-edges

===================================================================

M	source/blender/bmesh/intern/bmesh_core.c
M	source/blender/bmesh/intern/bmesh_structure.c

===================================================================

diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index 7d6743e..16a9ecb 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -1687,7 +1687,7 @@ BMEdge *bmesh_jekv(
 	BMEdge *e_old;
 	BMVert *v_old, *tv;
 	BMLoop *l_kill;
-	int len, radlen = 0, i;
+	int radlen = 0, i;
 	bool halt = false;
 #ifndef NDEBUG
 	bool edok;
@@ -1698,10 +1698,8 @@ BMEdge *bmesh_jekv(
 	if (BM_vert_in_edge(e_kill, v_kill) == 0) {
 		return NULL;
 	}
-
-	len = bmesh_disk_count(v_kill);
 	
-	if (len == 2) {
+	if (bmesh_disk_count_ex(v_kill, 3) == 2) {
 #ifndef NDEBUG
 		int valence1, valence2;
 		BMLoop *l;
diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c
index cf56c3b..5d2eed8 100644
--- a/source/blender/bmesh/intern/bmesh_structure.c
+++ b/source/blender/bmesh/intern/bmesh_structure.c
@@ -228,7 +228,7 @@ bool bmesh_disk_validate(int len, BMEdge *e, BMVert *v)
 
 	if (!BM_vert_in_edge(e, v))
 		return false;
-	if (bmesh_disk_count(v) != len || len == 0)
+	if (bmesh_disk_count_ex(v, len + 1) != len || len == 0)
 		return false;
 
 	e_iter = e;