blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T39726: wire edges cause bevel artifacts. 

Now code explicity excludes wire edges from beveling
and reattaches the wire edges to one of the newly
created vertices after beveling.
Also fixes a bug where vertex-beveling a wire-edge-only
vertex would not reattach the wire edges.
This commit is contained in:
Howard Trickey 2014-04-28 09:07:47 -04:00
parent 6dec2b1a2b
commit 27db75363e
Notes: blender-bot 2023-02-14 10:47:22 +01:00 
Referenced by issue #39762, Object gets weird extra faces
1 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
source/blender/bmesh/tools/bmesh_bevel.c
View File

@ -2821,6 +2821,7 @@ static BevVert *bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v)
* Want edges to be ordered so that they share faces.
* There may be one or more chains of shared faces broken by
* gaps where there are no faces.
* Want to ignore wire edges completely for edge beveling.
* TODO: make following work when more than one gap.
*/
@ -2837,9 +2838,15 @@ static BevVert *bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v)
/* good to start face chain from this edge */
first_bme = bme;
}
ntot++;
BM_BEVEL_EDGE_TAG_DISABLE(bme);
if (fcnt > 0 || bp->vertex_only) {
ntot++;
BM_BEVEL_EDGE_TAG_DISABLE(bme);
}
else {
/* Mark this wire edge as "chosen" already
* so loop below will not choose it at all */
BM_BEVEL_EDGE_TAG_ENABLE(bme);
}
}
if (!first_bme)
first_bme = v->e;
@ -2850,10 +2857,6 @@ static BevVert *bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v)
return NULL;
}
/* avoid calling BM_vert_edge_count since we loop over edges already */
// ntot = BM_vert_edge_count(v);
// BLI_assert(ntot == BM_vert_edge_count(v));
bv = (BevVert *)BLI_memarena_alloc(bp->mem_arena, (sizeof(BevVert)));
bv->v = v;
bv->edgecount = ntot;
@ -2938,6 +2941,11 @@ static BevVert *bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v)
}
}
/* now done with tag flag */
BM_ITER_ELEM (bme, &iter, v, BM_EDGES_OF_VERT) {
BM_BEVEL_EDGE_TAG_DISABLE(bme);
}
/* if edge array doesn't go CCW around vertex from average normal side,
* reverse the array, being careful to reverse face pointers too */
if (ntot > 1) {
@ -3016,7 +3024,6 @@ static BevVert *bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v)
e->offset_l = e->offset_l_spec;
e->offset_r = e->offset_r_spec;
BM_BEVEL_EDGE_TAG_DISABLE(e->e);
if (e->fprev && e->fnext)
e->is_seam = !contig_ldata_across_edge(bm, e->e, e->fprev, e->fnext);
else
@ -3128,6 +3135,40 @@ static void bevel_rebuild_existing_polygons(BMesh *bm, BevelParams *bp, BMVert *
}
}
/* If there were any wire edges, they need to be reattached somewhere */
static void bevel_reattach_wires(BMesh *bm, BevelParams *bp, BMVert *v)
{
BMEdge *e;
BMVert *vclosest, *vother;
BMIter e_iter;
BevVert *bv;
BoundVert *bndv;
float d, dclosest;
bv = find_bevvert(bp, v);
if (!bv || !bv->vmesh)
return;
BM_ITER_ELEM(e, &e_iter, v, BM_EDGES_OF_VERT) {
if (BM_edge_is_wire(e)) {
/* look for the new vertex closest to the other end of e */
vclosest = NULL;
dclosest = 1e10;
vother = BM_edge_other_vert(e, v);
bndv = bv->vmesh->boundstart;
do {
d = len_v3v3(vother->co, bndv->nv.co);
if (d < dclosest) {
vclosest = bndv->nv.v;
BLI_assert(vclosest != NULL);
dclosest = d;
}
} while((bndv = bndv->next) != bv->vmesh->boundstart);
if (vclosest)
BM_edge_create(bm, vclosest, vother, e, 0);
}
}
}
static void bev_merge_end_uvs(BMesh *bm, BevVert *bv, EdgeHalf *e)
{
VMesh *vm = bv->vmesh;
@ -3504,6 +3545,7 @@ void BM_mesh_bevel(BMesh *bm, const float offset, const int offset_type,
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
bevel_rebuild_existing_polygons(bm, &bp, v);
bevel_reattach_wires(bm, &bp, v);
}
}