archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

BMesh: avoid over-counting vert-edges

Browse Source
This commit is contained in:
Campbell Barton
2015-04-29 10:25:59 +10:00
parent 728d4f296f
commit e1ecd39f0e
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/bmesh/intern/bmesh_core.c
View File

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

2
source/blender/bmesh/intern/bmesh_structure.c
View File

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