Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Dick <hen-di@web.de>2020-10-02 00:54:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-10-05 15:56:02 +0300
commit1454865ebb996bdcd9007abb440772335a285a36 (patch)
treeb49f03c56e4f4f8fc0e5cc945672c8a4bcb43390
parent8b72d9cc1530fb6fbd37b6a2e02aa61242f8d24a (diff)
Fix T80269: Match material offset in solidify modes
This commit to complex solidify swaps the side of the geometry which is affected by the material offset when the normal flip option is enabled. This matches simple solidify and is considered correct/useful. Ref D8948
-rw-r--r--source/blender/modifiers/intern/MOD_solidify_nonmanifold.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
index 1e0269617ec..6dd04745d07 100644
--- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
+++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
@@ -2391,7 +2391,7 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
CustomData_copy_data(&mesh->pdata, &result->pdata, (int)(i / 2), (int)poly_index, 1);
mpoly[poly_index].loopstart = (int)loop_index;
mpoly[poly_index].totloop = (int)k;
- mpoly[poly_index].mat_nr = fr->face->mat_nr + (fr->reversed ? mat_ofs : 0);
+ mpoly[poly_index].mat_nr = fr->face->mat_nr + (fr->reversed != do_flip ? mat_ofs : 0);
CLAMP(mpoly[poly_index].mat_nr, 0, mat_nr_max);
mpoly[poly_index].flag = fr->face->flag;
if (fr->reversed != do_flip) {