diff options
author | Howard Trickey <howard.trickey@gmail.com> | 2020-11-12 00:37:22 +0300 |
---|---|---|
committer | Howard Trickey <howard.trickey@gmail.com> | 2020-11-12 00:37:22 +0300 |
commit | 1043ec7991732476686a697048cf8cc5f183e3dc (patch) | |
tree | 2875f964434219344871507b3e9e920946e6c4a1 /source/blender/bmesh/tools | |
parent | 88e6341ce84851132ceba8407fb2c3058f34b6dd (diff) | |
parent | b99faa0f567fdf139a8e357112f9b2c7a0458aa5 (diff) |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender/bmesh/tools')
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index ce58b8b8382..9497466723a 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1334,7 +1334,21 @@ static void offset_meet(BevelParams *bp, copy_v3_v3(norm_v, f->no); } else { - copy_v3_v3(norm_v, v->no); + /* Get average of face norms of faces between e and e2. */ + int fcount = 0; + zero_v3(norm_v); + for (EdgeHalf *eloop = e1; eloop != e2; eloop = eloop->next) { + if (eloop->fnext != NULL) { + add_v3_v3(norm_v, eloop->fnext->no); + fcount++; + } + } + if (fcount == 0) { + copy_v3_v3(norm_v, v->no); + } + else { + mul_v3_fl(norm_v, 1.0f / fcount); + } } add_v3_v3(dir1, dir2); cross_v3_v3v3(norm_perp1, dir1, norm_v); |