diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-14 09:50:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-14 10:01:30 +0300 |
commit | c6cbcf83d0153922ac32452c198252f44867a6cb (patch) | |
tree | 2916f1301181d41655605dc472a762fe9c8aa641 /source/blender/editors/mesh/editmesh_tools.c | |
parent | 6074f62d1a099fc378aa25506a93321dba2d956b (diff) |
Fix T61472: Hide Unselected fails w/ no selection
Also skip mesh recalculation when no hide/reveal is performed.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 41921b49792..46f5d4e952e 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -1983,6 +1983,7 @@ static int edbm_hide_exec(bContext *C, wmOperator *op) { const bool unselected = RNA_boolean_get(op->ptr, "unselected"); ViewLayer *view_layer = CTX_data_view_layer(C); + bool changed = false; uint objects_len = 0; Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, CTX_wm_view3d(C), &objects_len); @@ -1991,18 +1992,28 @@ static int edbm_hide_exec(bContext *C, wmOperator *op) BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; - if ((bm->totvertsel == 0) && - (bm->totedgesel == 0) && - (bm->totfacesel == 0)) - { - continue; + if (unselected) { + if (bm->totvertsel == bm->totvert) { + continue; + } + } + else { + if (bm->totvertsel == 0) { + continue; + } } - EDBM_mesh_hide(em, unselected); - EDBM_update_generic(em, true, false); + if (EDBM_mesh_hide(em, unselected)) { + EDBM_update_generic(em, true, false); + changed = true; + } } - MEM_freeN(objects); + + if (!changed) { + return OPERATOR_CANCELLED; + } + return OPERATOR_FINISHED; } @@ -2041,8 +2052,9 @@ static int edbm_reveal_exec(bContext *C, wmOperator *op) Object *obedit = objects[ob_index]; BMEditMesh *em = BKE_editmesh_from_object(obedit); - EDBM_mesh_reveal(em, select); - EDBM_update_generic(em, true, false); + if (EDBM_mesh_reveal(em, select)) { + EDBM_update_generic(em, true, false); + } } MEM_freeN(objects); |