archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender-v2.81-release'

Browse Source
This commit is contained in:
Campbell Barton
2019-11-08 19:18:25 +11:00
parent 45a03057fa 73b9e86b49
commit 7b9f4320cc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -930,7 +930,7 @@ static void edbm_add_edge_face_exec__tricky_finalize_sel(BMesh *bm, BMElem *ele_
static int edbm_add_edge_face_exec(bContext *C, wmOperator *op) static int edbm_add_edge_face_exec(bContext *C, wmOperator *op)
{ {
/* when this is used to dissolve we could avoid this, but checking isnt too slow */ /* when this is used to dissolve we could avoid this, but checking isnt too slow */
bool changed_multi = false;
ViewLayer *view_layer = CTX_data_view_layer(C); ViewLayer *view_layer = CTX_data_view_layer(C);
uint objects_len = 0; uint objects_len = 0;
Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data( Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(
@@ -1005,9 +1005,14 @@ static int edbm_add_edge_face_exec(bContext *C, wmOperator *op)
} }
EDBM_update_generic(em, true, true); EDBM_update_generic(em, true, true);
changed_multi = true;
} }
MEM_freeN(objects); MEM_freeN(objects);
if (!changed_multi) {
return OPERATOR_CANCELLED;
}
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }