diff options
| author | mano-wii <germano.costa@ig.com.br> | 2019-08-26 20:15:25 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2019-08-26 20:15:25 +0300 |
| commit | 6b189d2bcf3536231f7040926ed34fe01012f14e (patch) | |
| tree | 66a47b371c5e077fc0251c6e487956b998f6ef3e /source/blender/editors/transform/transform_conversions.c | |
| parent | 7273dbd47b7ab7ae0016f17f95e71221fb8773d2 (diff) | |
Edit Mesh: New option "Split Edges & Faces" to "AutoMerge"
Ref T66423
Differential revision: https://developer.blender.org/D5562
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index a6514526166..94a19514a86 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -7126,7 +7126,14 @@ static void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t) hflag = BM_ELEM_SELECT; } - EDBM_automerge(t->scene, tc->obedit, true, hflag); + if (t->scene->toolsettings->automerge & AUTO_MERGE) { + if (t->scene->toolsettings->automerge & AUTO_MERGE_AND_SPLIT) { + EDBM_automerge_and_split(t->scene, tc->obedit, true, true, hflag); + } + else { + EDBM_automerge(t->scene, tc->obedit, true, hflag); + } + } /* Special case, this is needed or faces won't re-select. * Flush selected edges to faces. */ |