blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T61427: Bevel crash with patch miter. 

The adjustment phase had broken assumptions after adding miters,
and sent a null problem to eigen. Fixed code to check assumptions.
This commit is contained in:
Howard Trickey 2019-02-14 17:21:50 -05:00
parent 0f135f80f2
commit 5c432cd11b
Notes: blender-bot 2023-02-14 05:04:52 +01:00 
Referenced by issue #61427, Bevel Modifier - Crash on changing Miter type.
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2816,10 +2816,11 @@ static void adjust_the_cycle_or_chain(BoundVert *vstart, bool iscycle)
static void adjust_offsets(BevelParams *bp)
{
BevVert *bv, *bvcur;
BoundVert *v, *vanchor, *vchainstart, *vnext;
BoundVert *v, *vanchor, *vchainstart, *vchainend, *vnext;
EdgeHalf *enext;
GHashIterator giter;
bool iscycle;
int chainlen;
/* find and process chains and cycles of unvisited BoundVerts that have eon set */
GHASH_ITER(giter, bp->vert_hash) {
@ -2840,8 +2841,9 @@ static void adjust_offsets(BevelParams *bp)
* pairs with the right side of the next edge in the cycle or chain. */
/* first follow paired edges in left->right direction */
v = vchainstart = vanchor;
v = vchainstart = vchainend = vanchor;
iscycle = false;
chainlen = 1;
while (v->eon && !v->visited && !iscycle) {
v->visited = true;
if (!v->efirst)
@ -2852,6 +2854,8 @@ static void adjust_offsets(BevelParams *bp)
BLI_assert(enext != NULL);
vnext = enext->leftv;
v->adjchain = vnext;
vchainend = vnext;
chainlen++;
if (vnext->visited) {
if (vnext != vchainstart) {
break;
@ -2874,10 +2878,12 @@ static void adjust_offsets(BevelParams *bp)
break;
vnext = enext->rightv;
vnext->adjchain = v;
chainlen++;
vchainstart = vnext;
v = vnext;
} while (!v->visited && v->eon);
adjust_the_cycle_or_chain(vchainstart, false);
if (chainlen >= 3 && !vchainstart->eon && !vchainend->eon)
adjust_the_cycle_or_chain(vchainstart, false);
}
} while ((vanchor = vanchor->next) != bv->vmesh->boundstart);
}

2
source/tools

@ -1 +1 @@
Subproject commit 83428cbf0a8d7e0bdd7a91c00124381c1db42e70
Subproject commit 3f0d91e9249bf35b92ee745e2c45c460c869fb25