diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-01-29 09:00:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-29 09:00:26 +0300 |
| commit | a554ff969332b99fdcbc53ec940f08df10639430 (patch) | |
| tree | b7a3e4e1ee93df481362c6b91d6c4b447c896416 /source/blender/modifiers | |
| parent | a622e29a25414d6f3a050f609abb667dabfe4624 (diff) | |
| parent | dee9c3cc25419146bd38016f0e2ec98eea282962 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_solidify_nonmanifold.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c index 144ba25c8fa..799c1c966a3 100644 --- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c +++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c @@ -1407,7 +1407,7 @@ Mesh *MOD_solidify_nonmanifold_applyModifier(ModifierData *md, disable_boundary_fix = true; } } - /* Simple/Even Method. */ + /* Fixed/Even Method. */ else { float total_angle = 0; float total_angle_back = 0; @@ -1520,6 +1520,9 @@ Mesh *MOD_solidify_nonmanifold_applyModifier(ModifierData *md, if (has_back && total_angle_back > FLT_EPSILON) { mul_v3_fl(nor_back, 1.0f / total_angle_back); add_v3_v3(nor, nor_back); + if (has_front && total_angle > FLT_EPSILON) { + mul_v3_fl(nor, 0.5f); + } } } /* Set move_nor for boundary fix. */ |