From 6e98c791af2b17f61c6e7d18dcbf561ab3239a41 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 12 Apr 2011 12:49:54 +0000 Subject: [PATCH] fix [#26885] transform option disapears when deselecting loops deselecting edgeloop & edgering would leave the verts de-selected even if other edges had them selected. --- source/blender/editors/mesh/editmesh_mods.c | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 375ec474382..bc8c50386ce 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -1827,6 +1827,20 @@ static int edge_not_in_tagged_face(EditMesh *em, EditEdge *eed) return 1; } +static void ensure_ed_vert_sel(EditMesh *em) +{ + EditEdge *eed; + + /* EM_selectmode_flush() doesnt take into account that deselected edges + * may be still connected to selected edges [#26885] */ + for(eed= em->edges.first; eed; eed= eed->next) { + if(eed->f & SELECT) { + eed->v1->f |= SELECT; + eed->v2->f |= SELECT; + } + } +} + /* selects or deselects edges that: - if edges has 2 faces: - has vertices with valence of 4 @@ -1899,6 +1913,10 @@ static void edgeloop_select(EditMesh *em, EditEdge *starteed, int select) for(eed= em->edges.first; eed; eed= eed->next) { if(eed->f2) EM_select_edge(eed, select); } + + if(select == FALSE) { + ensure_ed_vert_sel(em); + } } /* @@ -1968,6 +1986,10 @@ static void edgering_select(EditMesh *em, EditEdge *startedge, int select) for(eed= em->edges.first; eed; eed= eed->next) { if(eed->f2) EM_select_edge(eed, select); } + + if(select == FALSE) { + ensure_ed_vert_sel(em); + } } static int loop_multiselect(bContext *C, wmOperator *op)