Fix T45348: Collapse gives sel verts in face mode

2015-07-14 07:02:35 +10:00
parent 55374426c6
commit 9f78aa4c36
1 changed files with 5 additions and 0 deletions
--- 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;
 }