Merge branch 'master' into blender2.8

Conflicts:
	intern/cycles/blender/addon/ui.py
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenkernel/intern/particle_distribute.c
	source/blender/blenkernel/intern/texture.c
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/transform/transform_snap_object.c

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/bmesh/operators/bmo_connect_concave.c b/source/blender/bmesh/operators/bmo_connect_concave.c
index 8b9c60ada52..9bb67ed9341 100644
--- a/source/blender/bmesh/operators/bmo_connect_concave.c
+++ b/source/blender/bmesh/operators/bmo_connect_concave.c
@@ -107,10 +107,10 @@ static bool bm_face_split_by_concave(
 		int i;
 		for (i = 0; i < faces_array_tot; i++) {
 			BMFace *f = faces_array[i];
-			BMO_elem_flag_enable(bm, f, FACE_OUT);
+			BMO_face_flag_enable(bm, f, FACE_OUT);
 		}
 	}
-	BMO_elem_flag_enable(bm, f_base, FACE_OUT);
+	BMO_face_flag_enable(bm, f_base, FACE_OUT);
 
 	if (edges_array_tot) {
 		int i;
@@ -120,7 +120,7 @@ static bool bm_face_split_by_concave(
 		for (i = 0; i < edges_array_tot; i++) {
 			BMLoop *l_pair[2];
 			BMEdge *e = edges_array[i];
-			BMO_elem_flag_enable(bm, e, EDGE_OUT);
+			BMO_edge_flag_enable(bm, e, EDGE_OUT);
 
 			if (BM_edge_is_contiguous(e) &&
 			    BM_edge_loop_pair(e, &l_pair[0], &l_pair[1]))
@@ -153,7 +153,7 @@ static bool bm_face_split_by_concave(
 					BMFace *f_new, *f_pair[2] = {l_pair[0]->f, l_pair[1]->f};
 					f_new = BM_faces_join(bm, f_pair, 2, true);
 					if (f_new) {
-						BMO_elem_flag_enable(bm, f_new, FACE_OUT);
+						BMO_face_flag_enable(bm, f_new, FACE_OUT);
 					}
 				}
 			}