diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-05-23 18:35:45 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-05-23 18:35:45 +0300 |
| commit | 99c6601a1ffe744ef8592de5da5920156a1097a6 (patch) | |
| tree | 2dd91884fb1bc12144f4d585c4591db354725134 /source/blender/bmesh | |
| parent | 3db15ae23a542f60926baea24f838c8510371743 (diff) | |
| parent | 7b25ffb618dd7509d425f7a5891c64d4a3668743 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index a05c12a2730..5f4ed3db261 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -916,8 +916,12 @@ static bool offset_meet_edge(EdgeHalf *e1, EdgeHalf *e2, BMVert *v, float meetc return false; } cross_v3_v3v3(fno, dir1, dir2); - if (dot_v3v3(fno, v->no) < 0.0f) + if (dot_v3v3(fno, v->no) < 0.0f) { ang = 2.0f * (float)M_PI - ang; /* angle is reflex */ + if (r_angle) + *r_angle = ang; + return false; + } if (r_angle) *r_angle = ang; |