blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v2.91-release'

This commit is contained in:
Howard Trickey 2020-11-11 16:37:22 -05:00
parent 88e6341ce8 b99faa0f56
commit 1043ec7991
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);