diff options
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 7 | ||||
| m--------- | source/tools | 0 |
4 files changed, 3 insertions, 4 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject cd65bc3277eda27e1c0b9f20a25928f6586d89a +Subproject 469c949d1ca882be19daa128842f813b72a944d diff --git a/release/scripts/addons b/release/scripts/addons -Subproject f5536e5e49c34dfc0a7b8990257cd393339e23c +Subproject c88411ff7776a2db5d6ef6117a1b2faa42a9561 diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 35167835646..a18c4405a31 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1985,6 +1985,7 @@ static bool adjust_the_cycle_or_chain_fast(BoundVert *vstart, int np, bool iscyc g_prod[i] = gprod; gprod_sum += gprod; } + g_prod[0] = 1.0f; if (iscycle) { gprod *= g[0]; if (fabs(gprod - 1.0f) > BEVEL_EPSILON) { @@ -1993,8 +1994,6 @@ static bool adjust_the_cycle_or_chain_fast(BoundVert *vstart, int np, bool iscyc MEM_freeN(g_prod); return false; } - else - g_prod[0] = 1.0f; } if (gprod_sum == 0.0f) { MEM_freeN(g); @@ -2163,7 +2162,7 @@ static void adjust_offsets(BevelParams *bp) /* first follow paired edges in left->right direction */ v = vchainstart = vanchor; iscycle = false; - while(v->eon && !v->visited && !iscycle) { + while (v->eon && !v->visited && !iscycle) { enext = find_other_end_edge_half(bp, v->efirst, &bvcur); BLI_assert(enext != NULL); vnext = enext->leftv; @@ -2191,7 +2190,7 @@ static void adjust_offsets(BevelParams *bp) vchainstart = vnext; v->visited = true; v = vnext; - } while(!v->visited && v->eon); + } while (!v->visited && v->eon); adjust_the_cycle_or_chain(vchainstart, false); } } while ((vanchor = vanchor->next) != bv->vmesh->boundstart); diff --git a/source/tools b/source/tools -Subproject ccf20e08702ee6424edbda01544bb9f8bc386de +Subproject 7695e14cfc5820ac66546e0e515914d85ab81af |