blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

Revert "Fix T46494: Can't de-select a face w/ mixed modes" 

This reverts commit 381501ab45.
This commit is contained in:
Campbell Barton 2015-10-31 19:26:11 +11:00
parent 12e4da6c1a
commit b611bdb629
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/bmesh/intern/bmesh_marking.c
View File

@ -102,7 +102,6 @@ static bool bm_vert_is_edge_select_any(const BMVert *v)
}
#endif
#if 0
static bool bm_edge_is_face_select_any_other(BMLoop *l_first)
{
const BMLoop *l_iter = l_first;
@ -115,7 +114,6 @@ static bool bm_edge_is_face_select_any_other(BMLoop *l_first)
}
return false;
}
#endif
#if 0
static bool bm_edge_is_face_select_any(const BMEdge *e)
@ -500,20 +498,6 @@ void BM_face_select_set(BMesh *bm, BMFace *f, const bool select)
BM_elem_flag_disable(f, BM_ELEM_SELECT);
bm->totfacesel -= 1;
}
/**
* \note This allows a temporarily invalid state - where for eg
* an edge bay be de-selected, but an adjacent face remains selected.
*
* Rely on #BM_mesh_select_mode_flush to correct these cases.
*/
#if 1
l_iter = l_first = BM_FACE_FIRST_LOOP(f);
do {
BM_vert_select_set(bm, l_iter->v, false);
BM_edge_select_set(bm, l_iter->e, false);
} while ((l_iter = l_iter->next) != l_first);
#else
/* disabled, see T46494 */
/* flush down to edges */
l_iter = l_first = BM_FACE_FIRST_LOOP(f);
@ -531,7 +515,6 @@ void BM_face_select_set(BMesh *bm, BMFace *f, const bool select)
BM_vert_select_set(bm, l_iter->v, false);
}
} while ((l_iter = l_iter->next) != l_first);
#endif
}
}