diff options
author | Bastien Montagne <bastien@blender.org> | 2022-05-03 11:34:46 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-05-03 11:34:46 +0300 |
commit | 6b74c8e486623d7f3e50056bae7d9ffb103b3621 (patch) | |
tree | 5538b1efc32004635af0a929b71ba14c6d0ca885 /source/blender/blenkernel | |
parent | cd1044fb2bdbdcac74704215e2f0baeb7dece39b (diff) | |
parent | 20f819d7082f0f7582a7a9e7f7be66e2b59aae63 (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_mirror.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh_mirror.c b/source/blender/blenkernel/intern/mesh_mirror.c index 9202690b3c9..715a1c9daf9 100644 --- a/source/blender/blenkernel/intern/mesh_mirror.c +++ b/source/blender/blenkernel/intern/mesh_mirror.c @@ -455,7 +455,10 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd, if (flip_map) { for (i = 0; i < maxVerts; dvert++, i++) { /* merged vertices get both groups, others get flipped */ - if (do_vtargetmap && (vtargetmap[i] != -1)) { + if (use_correct_order_on_merge && do_vtargetmap && (vtargetmap[i + maxVerts] != -1)) { + BKE_defvert_flip_merged(dvert - maxVerts, flip_map, flip_map_len); + } + else if (!use_correct_order_on_merge && do_vtargetmap && (vtargetmap[i] != -1)) { BKE_defvert_flip_merged(dvert, flip_map, flip_map_len); } else { |