diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-11-17 16:27:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-11-17 16:27:36 +0300 |
commit | 9d716b929de4322aea76b1bc2d5fa207c4ec1b5e (patch) | |
tree | 59689af24d245c32d7c9d9a63635eed41e896e0e /source/blender/editors | |
parent | 90e516d1a519684cc8b41f2328ebc97a1b71e86d (diff) | |
parent | a993600323867211f45f636058f20b66f144c34b (diff) |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 4 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_convert_mesh.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 54d0695434d..4dd543e71a9 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -1266,7 +1266,7 @@ static int edbm_select_similar_region_exec(bContext *C, wmOperator *op) groups_array = MEM_mallocN(sizeof(*groups_array) * bm->totfacesel, __func__); group_tot = BM_mesh_calc_face_groups( - bm, groups_array, &group_index, NULL, NULL, BM_ELEM_SELECT, BM_VERT); + bm, groups_array, &group_index, NULL, NULL, NULL, BM_ELEM_SELECT, BM_VERT); BM_mesh_elem_table_ensure(bm, BM_FACE); @@ -2822,7 +2822,7 @@ bool EDBM_select_interior_faces(BMEditMesh *em) fgroup_array = MEM_mallocN(sizeof(*fgroup_array) * bm->totface, __func__); fgroup_len = BM_mesh_calc_face_groups( - bm, fgroup_array, &fgroup_index, bm_interior_loop_filter_fn, NULL, 0, BM_EDGE); + bm, fgroup_array, &fgroup_index, bm_interior_loop_filter_fn, NULL, NULL, 0, BM_EDGE); int *fgroup_recalc_stack = MEM_mallocN(sizeof(*fgroup_recalc_stack) * fgroup_len, __func__); STACK_DECLARE(fgroup_recalc_stack); diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c index 6c0b03c6206..5f41aaa8e50 100644 --- a/source/blender/editors/transform/transform_convert_mesh.c +++ b/source/blender/editors/transform/transform_convert_mesh.c @@ -98,7 +98,7 @@ static void editmesh_islands_info_calc(BMEditMesh *em, else { /* (bm->selectmode & SCE_SELECT_FACE) */ groups_array = MEM_mallocN(sizeof(*groups_array) * bm->totfacesel, __func__); group_tot = BM_mesh_calc_face_groups( - bm, groups_array, &group_index, NULL, NULL, BM_ELEM_SELECT, BM_VERT); + bm, groups_array, &group_index, NULL, NULL, NULL, BM_ELEM_SELECT, BM_VERT); htype = BM_FACE; itype = BM_VERTS_OF_FACE; |