[Bf-blender-cvs] [9f78aa4] master: Fix T45348: Collapse gives sel verts in face mode

[Campbell Barton]

Commit: 9f78aa4c363e2e8df7f41400dbc652ab79b8626b
Author: Campbell Barton
Date:   Tue Jul 14 07:02:35 2015 +1000
Branches: master
https://developer.blender.org/rB9f78aa4c363e2e8df7f41400dbc652ab79b8626b

Fix T45348: Collapse gives sel verts in face mode

===================================================================

M	source/blender/editors/mesh/editmesh_tools.c

===================================================================

diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index b3f2805..7f52234 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;
 }