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:
authorCampbell Barton <ideasman42@gmail.com>2015-07-14 00:02:35 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-07-14 00:02:35 +0300
commit9f78aa4c363e2e8df7f41400dbc652ab79b8626b (patch)
tree03a1bc4d65ddfe3dea8754508b2a49948db29c63 /source/blender/editors/mesh
parent55374426c649470ceefc78c3337d440303776335 (diff)
Fix T45348: Collapse gives sel verts in face mode
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index b3f28055952..7f5223426b6 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -2204,6 +2204,11 @@ static int edbm_merge_exec(bContext *C, wmOperator *op)
EDBM_update_generic(em, true, true);
+ /* once collapsed, we can't have edge/face selection */
+ if ((em->selectmode & SCE_SELECT_VERTEX) == 0) {
+ EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+ }
+
return OPERATOR_FINISHED;
}