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, 17 insertions, 17 deletions

diff --git a/source/blender/bmesh/intern/bmesh_delete.c b/source/blender/bmesh/intern/bmesh_delete.c
index 882d78ce6b3..1449a6ef9d7 100644
--- a/source/blender/bmesh/intern/bmesh_delete.c
+++ b/source/blender/bmesh/intern/bmesh_delete.c
@@ -54,7 +54,7 @@ static void bmo_remove_tagged_faces(BMesh *bm, const short oflag)
 	BMIter iter;
 
 	BM_ITER_MESH_MUTABLE (f, f_next, &iter, bm, BM_FACES_OF_MESH) {
-		if (BMO_elem_flag_test(bm, f, oflag)) {
+		if (BMO_face_flag_test(bm, f, oflag)) {
 			BM_face_kill(bm, f);
 		}
 	}
@@ -66,7 +66,7 @@ static void bmo_remove_tagged_edges(BMesh *bm, const short oflag)
 	BMIter iter;
 
 	BM_ITER_MESH_MUTABLE (e, e_next, &iter, bm, BM_EDGES_OF_MESH) {
-		if (BMO_elem_flag_test(bm, e, oflag)) {
+		if (BMO_edge_flag_test(bm, e, oflag)) {
 			BM_edge_kill(bm, e);
 		}
 	}
@@ -78,7 +78,7 @@ static void bmo_remove_tagged_verts(BMesh *bm, const short oflag)
 	BMIter iter;
 
 	BM_ITER_MESH_MUTABLE (v, v_next, &iter, bm, BM_VERTS_OF_MESH) {
-		if (BMO_elem_flag_test(bm, v, oflag)) {
+		if (BMO_vert_flag_test(bm, v, oflag)) {
 			BM_vert_kill(bm, v);
 		}
 	}
@@ -90,7 +90,7 @@ static void bmo_remove_tagged_verts_loose(BMesh *bm, const short oflag)
 	BMIter iter;
 
 	BM_ITER_MESH_MUTABLE (v, v_next, &iter, bm, BM_VERTS_OF_MESH) {
-		if (BMO_elem_flag_test(bm, v, oflag) && (v->e == NULL)) {
+		if (BMO_vert_flag_test(bm, v, oflag) && (v->e == NULL)) {
 			BM_vert_kill(bm, v);
 		}
 	}
@@ -132,9 +132,9 @@ void BMO_mesh_delete_oflag_context(BMesh *bm, const short oflag, const int type)
 		{
 			/* flush down to vert */
 			BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
-				if (BMO_elem_flag_test(bm, e, oflag)) {
-					BMO_elem_flag_enable(bm, e->v1, oflag);
-					BMO_elem_flag_enable(bm, e->v2, oflag);
+				if (BMO_edge_flag_test(bm, e, oflag)) {
+					BMO_vert_flag_enable(bm, e->v1, oflag);
+					BMO_vert_flag_enable(bm, e->v2, oflag);
 				}
 			}
 			bmo_remove_tagged_edges(bm, oflag);
@@ -165,27 +165,27 @@ void BMO_mesh_delete_oflag_context(BMesh *bm, const short oflag, const int type)
 		{
 			/* go through and mark all edges and all verts of all faces for delete */
 			BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
-				if (BMO_elem_flag_test(bm, f, oflag)) {
+				if (BMO_face_flag_test(bm, f, oflag)) {
 					BMLoop *l_first = BM_FACE_FIRST_LOOP(f);
 					BMLoop *l_iter;
 
 					l_iter = l_first;
 					do {
-						BMO_elem_flag_enable(bm, l_iter->v, oflag);
-						BMO_elem_flag_enable(bm, l_iter->e, oflag);
+						BMO_vert_flag_enable(bm, l_iter->v, oflag);
+						BMO_edge_flag_enable(bm, l_iter->e, oflag);
 					} while ((l_iter = l_iter->next) != l_first);
 				}
 			}
 			/* now go through and mark all remaining faces all edges for keeping */
 			BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
-				if (!BMO_elem_flag_test(bm, f, oflag)) {
+				if (!BMO_face_flag_test(bm, f, oflag)) {
 					BMLoop *l_first = BM_FACE_FIRST_LOOP(f);
 					BMLoop *l_iter;
 
 					l_iter = l_first;
 					do {
-						BMO_elem_flag_disable(bm, l_iter->v, oflag);
-						BMO_elem_flag_disable(bm, l_iter->e, oflag);
+						BMO_vert_flag_disable(bm, l_iter->v, oflag);
+						BMO_edge_flag_disable(bm, l_iter->e, oflag);
 					} while ((l_iter = l_iter->next) != l_first);
 				}
 			}
@@ -195,13 +195,13 @@ void BMO_mesh_delete_oflag_context(BMesh *bm, const short oflag, const int type)
 				/* Only exception to normal 'DEL_FACES' logic. */
 				if (type == DEL_FACES_KEEP_BOUNDARY) {
 					if (BM_edge_is_boundary(e)) {
-						BMO_elem_flag_disable(bm, e, oflag);
+						BMO_edge_flag_disable(bm, e, oflag);
 					}
 				}
 
-				if (!BMO_elem_flag_test(bm, e, oflag)) {
-					BMO_elem_flag_disable(bm, e->v1, oflag);
-					BMO_elem_flag_disable(bm, e->v2, oflag);
+				if (!BMO_edge_flag_test(bm, e, oflag)) {
+					BMO_vert_flag_disable(bm, e->v1, oflag);
+					BMO_vert_flag_disable(bm, e->v2, oflag);
 				}
 			}