diff options
author | Henrik Dick <hen-di@web.de> | 2022-02-11 00:39:38 +0300 |
---|---|---|
committer | Henrik Dick <hen-di@web.de> | 2022-02-11 00:39:38 +0300 |
commit | 6804ab238114e0873c2a06b3865f44490f25de15 (patch) | |
tree | 05faa8c324636d20ba7c22bf1905ac245ff42142 /source | |
parent | 516781da809dcded258b0f1a9e817f7945d1b99e (diff) | |
parent | 39bac58cdf3f1db633913ea4838bf223bc15ec3b (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 8 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_solidify_nonmanifold.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index b429399f310..5461e2421f2 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -6373,10 +6373,10 @@ static BevVert *bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v) sub_v3_v3v3(edge_dir, bv->v->co, v2->co); float z = fabsf(2.0f * sinf(angle_v3v3(vert_axis, edge_dir))); if (z < BEVEL_EPSILON) { - e->offset_l_spec = 0.01f * bp->offset; /* Undefined behavior, so tiny bevel. */ + e->offset_l_spec = 0.01f * bv->offset; /* Undefined behavior, so tiny bevel. */ } else { - e->offset_l_spec = bp->offset / z; + e->offset_l_spec = bv->offset / z; } break; } @@ -6385,10 +6385,10 @@ static BevVert *bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v) sub_v3_v3v3(edge_dir, bv->v->co, v2->co); float z = fabsf(cosf(angle_v3v3(vert_axis, edge_dir))); if (z < BEVEL_EPSILON) { - e->offset_l_spec = 0.01f * bp->offset; /* Undefined behavior, so tiny bevel. */ + e->offset_l_spec = 0.01f * bv->offset; /* Undefined behavior, so tiny bevel. */ } else { - e->offset_l_spec = bp->offset / z; + e->offset_l_spec = bv->offset / z; } break; } diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c index 1aa52d44509..5f6decdbe80 100644 --- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c +++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c @@ -1924,7 +1924,7 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md, int *origindex_edge = CustomData_get_layer(&result->edata, CD_ORIGINDEX); int *origindex_poly = CustomData_get_layer(&result->pdata, CD_ORIGINDEX); - if (bevel_convex != 0.0f) { + if (bevel_convex != 0.0f || (result->cd_flag & ME_CDFLAG_VERT_BWEIGHT) != 0) { /* make sure bweight is enabled */ result->cd_flag |= ME_CDFLAG_EDGE_BWEIGHT; } |