Merge branch 'blender-v2.82-release'

1 files changed, 9 insertions, 6 deletions

diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index 887a971d516..02e4d0eb708 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -421,17 +421,20 @@ static void edbm_bevel_exit(bContext *C, wmOperator *op)
     ED_area_status_text(sa, NULL);
   }
 
+  for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
+    Object *obedit = opdata->ob_store[ob_index].ob;
+    BMEditMesh *em = BKE_editmesh_from_object(obedit);
+    /* Without this, faces surrounded by selected edges/verts will be unselected. */
+    if ((em->selectmode & SCE_SELECT_FACE) == 0) {
+      EDBM_selectmode_flush(em);
+    }
+  }
+
   if (opdata->is_modal) {
     View3D *v3d = CTX_wm_view3d(C);
     ARegion *ar = CTX_wm_region(C);
     for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
-      Object *obedit = opdata->ob_store[ob_index].ob;
-      BMEditMesh *em = BKE_editmesh_from_object(obedit);
       EDBM_redo_state_free(&opdata->ob_store[ob_index].mesh_backup, NULL, false);
-      /* Without this, faces surrounded by selected edges/verts will be unselected. */
-      if ((em->selectmode & SCE_SELECT_FACE) == 0) {
-        EDBM_selectmode_flush(em);
-      }
     }
     ED_region_draw_cb_exit(ar->type, opdata->draw_handle_pixel);
     if (v3d) {