Fix T45348: Collapse gives sel verts in face mode
authorCampbell Barton <ideasman42@gmail.com>
Mon, 13 Jul 2015 21:02:35 +0000 (07:02 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 13 Jul 2015 21:02:35 +0000 (07:02 +1000)
source/blender/editors/mesh/editmesh_tools.c

index b3f28055952cba9ee6d3f9399669345563501224..7f5223426b625a7be1cd461aefccc30397d63069 100644 (file)
@@ -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;
 }