griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix error in last commit. Misunderstood BM_vert_is_manifold(), added some comments.

Browse Source
This commit is contained in:
Campbell Barton
2012-04-18 06:36:47 +00:00
parent 6389301eb5
commit 27696ddae1
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/bmesh/intern/bmesh_queries.c
View File

@@ -470,10 +470,10 @@ int BM_edge_is_wire(BMEdge *e)
/**
* A vertex is non-manifold if it meets the following conditions:
* 1: Loose - (has no edges/faces incident upon it)
* 2: Joins two distinct regions - (two pyramids joined at the tip)
* 3: Is part of a non-manifold edge (edge with more than 2 faces)
* 4: Is part of a wire edge
* 1: Loose - (has no edges/faces incident upon it).
* 2: Joins two distinct regions - (two pyramids joined at the tip).
* 3: Is part of a an edge with more than 2 faces.
* 4: Is part of a wire edge.
*/
int BM_vert_is_manifold(BMVert *v)
{
@@ -487,18 +487,17 @@ int BM_vert_is_manifold(BMVert *v)
}
/* count edges while looking for non-manifold edges */
oe = v->e;
for (len = 0, e = v->e; e != oe || (e == oe && len == 0); len++, e = bmesh_disk_edge_next(e, v)) {
if (e->l == NULL) {
/* loose edge */
len = 0;
oe = e = v->e;
do {
/* loose edge or edge shared by more than two faces,
* edges with 1 face user are OK, otherwise we could
* use BM_edge_is_manifold() here */
if (e->l == NULL || bmesh_radial_length(e->l) > 2) {
return FALSE;
}
if (bmesh_radial_length(e->l) > 2) {
/* edge shared by more than two faces */
return FALSE;
}
}
len++;
} while((e = bmesh_disk_edge_next(e, v)) != oe);
count = 1;
flag = 1;

8
source/blender/bmesh/tools/BME_bevel.c
View File

@@ -148,6 +148,7 @@ float *BME_new_transdata_float(BME_TransData_Head *td)
* The drawback, though, is that this code doesn't merge customdata. */
static int BME_Bevel_Dissolve_Disk(BMesh *bm, BMVert *v)
{
BMIter iter;
BMEdge *e, *elast;
BMLoop *l1, *l2;
@@ -155,6 +156,13 @@ static int BME_Bevel_Dissolve_Disk(BMesh *bm, BMVert *v)
return 0;
}
/* hrmf, we could have a version of BM_vert_is_manifold() which checks for this case */
BM_ITER(e, &iter, bm, BM_EDGES_OF_VERT, v) {
if (BM_edge_face_count(e) != 2) {
return 0;
}
}
if (BM_vert_edge_count(v) > 2) {
while (BM_vert_edge_count(v) > 2) {
e = v->e;