Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix bevel crash #33801, when first edge of a vertex is wire.

Browse Source
This commit is contained in:
Howard Trickey
2013-01-08 03:30:31 +00:00
parent d7e6d02161
commit 4d1d50ea8b
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1499,7 +1499,7 @@ static void bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v)
{ {
BMEdge *bme; BMEdge *bme;
BevVert *bv; BevVert *bv;
BMEdge *bme2, *unflagged_bme; BMEdge *bme2, *unflagged_bme, *first_bme;
BMFace *f; BMFace *f;
BMIter iter, iter2; BMIter iter, iter2;
EdgeHalf *e; EdgeHalf *e;
@@ -1511,10 +1511,16 @@ static void bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v)
* Only bevel selected edges that have exactly two incident faces. * Only bevel selected edges that have exactly two incident faces.
*/ */
if (bp->vertex_only)
first_bme = v->e;
else
first_bme = NULL;
BM_ITER_ELEM (bme, &iter, v, BM_EDGES_OF_VERT) { BM_ITER_ELEM (bme, &iter, v, BM_EDGES_OF_VERT) {
if (BM_elem_flag_test(bme, BM_ELEM_TAG) && !bp->vertex_only) { if (BM_elem_flag_test(bme, BM_ELEM_TAG) && !bp->vertex_only) {
BLI_assert(BM_edge_is_manifold(bme)); BLI_assert(BM_edge_is_manifold(bme));
nsel++; nsel++;
if (!first_bme)
first_bme = bme;
} }
ntot++; ntot++;
@@ -1543,7 +1549,8 @@ static void bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v)
/* add edges to bv->edges in order that keeps adjacent edges sharing /* add edges to bv->edges in order that keeps adjacent edges sharing
* a face, if possible */ * a face, if possible */
i = 0; i = 0;
bme = v->e;
bme = first_bme;
BM_BEVEL_EDGE_TAG_ENABLE(bme); BM_BEVEL_EDGE_TAG_ENABLE(bme);
e = &bv->edges[0]; e = &bv->edges[0];
e->e = bme; e->e = bme;
@@ -1557,6 +1564,8 @@ static void bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v)
continue; continue;
if (!unflagged_bme) if (!unflagged_bme)
unflagged_bme = bme2; unflagged_bme = bme2;
if (!bme->l)
continue;
BM_ITER_ELEM (f, &iter2, bme2, BM_FACES_OF_EDGE) { BM_ITER_ELEM (f, &iter2, bme2, BM_FACES_OF_EDGE) {
if (BM_face_edge_share_loop(f, bme)) { if (BM_face_edge_share_loop(f, bme)) {
found_shared_face = 1; found_shared_face = 1;
@@ -1591,7 +1600,7 @@ static void bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v)
} }
/* find wrap-around shared face */ /* find wrap-around shared face */
BM_ITER_ELEM (f, &iter2, bme, BM_FACES_OF_EDGE) { BM_ITER_ELEM (f, &iter2, bme, BM_FACES_OF_EDGE) {
if (BM_face_edge_share_loop(f, bv->edges[0].e)) { if (bv->edges[0].e->l && BM_face_edge_share_loop(f, bv->edges[0].e)) {
if (bv->edges[0].fnext == f) if (bv->edges[0].fnext == f)
continue; /* if two shared faces, want the other one now */ continue; /* if two shared faces, want the other one now */
bv->edges[ntot - 1].fnext = f; bv->edges[ntot - 1].fnext = f;