From 6b189d2bcf3536231f7040926ed34fe01012f14e Mon Sep 17 00:00:00 2001 From: mano-wii Date: Mon, 26 Aug 2019 14:15:25 -0300 Subject: Edit Mesh: New option "Split Edges & Faces" to "AutoMerge" Ref T66423 Differential revision: https://developer.blender.org/D5562 --- source/blender/editors/transform/transform_conversions.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/transform/transform_conversions.c') 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. */ -- cgit v1.2.3