style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions

5 files changed, 49 insertions, 49 deletions

diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 383f97da6a0..4690f11d9af 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -455,7 +455,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 	StitchPreviewer *stitch_preview = uv_get_stitch_previewer();
 
 	em= me->edit_btmesh;
-	activetf= EDBM_get_active_mtexpoly(em, &efa_act, FALSE); /* will be set to NULL if hidden */
+	activetf= EDBM_mtexpoly_active_get(em, &efa_act, FALSE); /* will be set to NULL if hidden */
 	activef = BM_active_face_get(em->bm, FALSE);
 	ts= scene->toolsettings;
 
diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h
index 0e2154006c1..fdcb5db1911 100644
--- a/source/blender/editors/uvedit/uvedit_intern.h
+++ b/source/blender/editors/uvedit/uvedit_intern.h
@@ -79,7 +79,7 @@ void uv_find_nearest_edge(struct Scene *scene, struct Image *ima, struct BMEditM
 
 /* utility tool functions */
 
-struct UvElement *ED_get_uv_element(struct UvElementMap *map, struct BMFace *efa, struct BMLoop *l);
+struct UvElement *ED_uv_element_get(struct UvElementMap *map, struct BMFace *efa, struct BMLoop *l);
 void uvedit_live_unwrap_update(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit);
 
 /* smart stitch */
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 3e6be67f233..3f4352d8ab3 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -98,7 +98,7 @@ int ED_uvedit_test(Object *obedit)
 		return 0;
 
 	em = BMEdit_FromObject(obedit);
-	ret = EDBM_texFaceCheck(em);
+	ret = EDBM_mtexpoly_check(em);
 	
 	return ret;
 }
@@ -927,7 +927,7 @@ static UvMapVert *uv_vertex_map_get(UvVertMap *vmap, BMFace *efa, int a)
 	BMLoop *l;
 
 	l = BM_iter_at_index(NULL, BM_LOOPS_OF_FACE, efa, a);
-	first= EDBM_get_uv_map_vert(vmap,  BM_elem_index_get(l->v));
+	first= EDBM_uv_vert_map_at_index(vmap,  BM_elem_index_get(l->v));
 
 	for (iterv=first; iterv; iterv=iterv->next) {
 		if (iterv->separate)
@@ -939,7 +939,7 @@ static UvMapVert *uv_vertex_map_get(UvVertMap *vmap, BMFace *efa, int a)
 	return NULL;
 }
 
-UvElement *ED_get_uv_element(UvElementMap *map, BMFace *efa, BMLoop *l)
+UvElement *ED_uv_element_get(UvElementMap *map, BMFace *efa, BMLoop *l)
 {
 	UvElement *element;
 
@@ -969,7 +969,7 @@ static int uv_edge_tag_faces(BMEditMesh *em, UvMapVert *first1, UvMapVert *first
 
 			if (iterv1->f == iterv2->f) {
 				/* if face already tagged, don't do this edge */
-				efa= EDBM_get_face_for_index(em, iterv1->f);
+				efa= EDBM_face_at_index(em, iterv1->f);
 				if (BMO_elem_flag_test(em->bm, efa, EFA_F1_FLAG))
 					return 0;
 
@@ -994,7 +994,7 @@ static int uv_edge_tag_faces(BMEditMesh *em, UvMapVert *first1, UvMapVert *first
 				break;
 
 			if (iterv1->f == iterv2->f) {
-				efa= EDBM_get_face_for_index(em, iterv1->f);
+				efa= EDBM_face_at_index(em, iterv1->f);
 				BMO_elem_flag_enable(em->bm, efa, EFA_F1_FLAG);
 				break;
 			}
@@ -1015,8 +1015,8 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit
 	int a, count, looking, nverts, starttotf, select;
 
 	/* setup */
-	EDBM_init_index_arrays(em, 0, 0, 1);
-	vmap= EDBM_make_uv_vert_map(em, 0, 0, limit);
+	EDBM_index_arrays_init(em, 0, 0, 1);
+	vmap= EDBM_uv_vert_map_create(em, 0, 0, limit);
 
 	BM_mesh_elem_index_ensure(em->bm, BM_VERT);
 
@@ -1114,8 +1114,8 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit
 	}
 
 	/* cleanup */
-	EDBM_free_uv_vert_map(vmap);
-	EDBM_free_index_arrays(em);
+	EDBM_uv_vert_map_free(vmap);
+	EDBM_index_arrays_free(em);
 
 	return (select)? 1: -1;
 }
@@ -1135,8 +1135,8 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[
 	unsigned int a;
 	char *flag;
 
-	EDBM_init_index_arrays(em, 0, 0, 1); /* we can use this too */
-	vmap= EDBM_make_uv_vert_map(em, 1, 1, limit);
+	EDBM_index_arrays_init(em, 0, 0, 1); /* we can use this too */
+	vmap= EDBM_uv_vert_map_create(em, 1, 1, limit);
 
 	if (vmap == NULL)
 		return;
@@ -1195,7 +1195,7 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[
 		BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 
 			/* make_uv_vert_map_EM sets verts tmp.l to the indices */
-			vlist= EDBM_get_uv_map_vert(vmap, BM_elem_index_get(l->v));
+			vlist= EDBM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v));
 			
 			startv= vlist;
 
@@ -1293,8 +1293,8 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[
 	
 	MEM_freeN(stack);
 	MEM_freeN(flag);
-	EDBM_free_uv_vert_map(vmap);
-	EDBM_free_index_arrays(em);
+	EDBM_uv_vert_map_free(vmap);
+	EDBM_index_arrays_free(em);
 }
 
 /* WATCH IT: this returns first selected UV,
@@ -2340,8 +2340,8 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje
 		
 		uvedit_pixel_to_float(sima, limit, 0.05);
 		
-		EDBM_init_index_arrays(em, 0, 0, 1);
-		vmap= EDBM_make_uv_vert_map(em, 0, 0, limit);
+		EDBM_index_arrays_init(em, 0, 0, 1);
+		vmap= EDBM_uv_vert_map_create(em, 0, 0, limit);
 		
 		/* verts are numbered above in make_uv_vert_map_EM, make sure this stays true! */
 		/* BMESH_TODO - why keep this commented? - campbell */
@@ -2364,7 +2364,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje
 					else
 						uvedit_uv_deselect(em, scene, l);
 					
-					vlist_iter= EDBM_get_uv_map_vert(vmap, BM_elem_index_get(l->v));
+					vlist_iter= EDBM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v));
 					
 					while (vlist_iter) {
 						if (vlist_iter->separate)
@@ -2383,7 +2383,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje
 							break;
 						
 						if (efa_index != vlist_iter->f) {
-							efa_vlist = EDBM_get_face_for_index(em, vlist_iter->f);
+							efa_vlist = EDBM_face_at_index(em, vlist_iter->f);
 							/* tf_vlist = CustomData_bmesh_get(&em->bm->pdata, efa_vlist->head.data, CD_MTEXPOLY); */ /* UNUSED */
 							
 							if (select)
@@ -2396,8 +2396,8 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje
 				}
 			}
 		}
-		EDBM_free_index_arrays(em);
-		EDBM_free_uv_vert_map(vmap);
+		EDBM_index_arrays_free(em);
+		EDBM_uv_vert_map_free(vmap);
 		
 	}
 	else { /* SI_STICKY_DISABLE or ts->uv_flag & UV_SYNC_SELECTION */
@@ -3041,7 +3041,7 @@ static int hide_exec(bContext *C, wmOperator *op)
 	int facemode= sima ? sima->flag & SI_SELACTFACE : 0;
 
 	if (ts->uv_flag & UV_SYNC_SELECTION) {
-		EDBM_hide_mesh(em, swap);
+		EDBM_mesh_hide(em, swap);
 		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 		return OPERATOR_FINISHED;
@@ -3100,7 +3100,7 @@ static int hide_exec(bContext *C, wmOperator *op)
 	}
 	
 	
-	EDBM_validate_selections(em);
+	EDBM_editselection_validate(em);
 	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
@@ -3140,7 +3140,7 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* call the mesh function if we are in mesh sync sel */
 	if (ts->uv_flag & UV_SYNC_SELECTION) {
-		EDBM_reveal_mesh(em);
+		EDBM_mesh_reveal(em);
 		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 		return OPERATOR_FINISHED;
@@ -3372,13 +3372,13 @@ static int seams_from_islands_exec(bContext *C, wmOperator *op)
 	em = me->edit_btmesh;
 	bm = em->bm;
 
-	if (!EDBM_texFaceCheck(em)) {
+	if (!EDBM_mtexpoly_check(em)) {
 		return OPERATOR_CANCELLED;
 	}
 
 	/* This code sets editvert->tmp.l to the index. This will be useful later on. */
-	EDBM_init_index_arrays(em, 0, 0, 1);
-	vmap = EDBM_make_uv_vert_map(em, 0, 0, limit);
+	EDBM_index_arrays_init(em, 0, 0, 1);
+	vmap = EDBM_uv_vert_map_create(em, 0, 0, limit);
 
 	BM_ITER(editedge, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 		/* flags to determine if we uv is separated from first editface match */
@@ -3406,14 +3406,14 @@ static int seams_from_islands_exec(bContext *C, wmOperator *op)
 				v1coincident = 0;
 
 			separated2 = 0;
-			efa1 = EDBM_get_face_for_index(em, mv1->f);
+			efa1 = EDBM_face_at_index(em, mv1->f);
 			mvinit2 = vmap->vert[BM_elem_index_get(editedge->v2)];
 
 			for (mv2 = mvinit2; mv2; mv2 = mv2->next) {
 				if (mv2->separate)
 					mv2sep = mv2;
 
-				efa2 = EDBM_get_face_for_index(em, mv2->f);
+				efa2 = EDBM_face_at_index(em, mv2->f);
 				if (efa1 == efa2) {
 					/* if v1 is not coincident no point in comparing */
 					if (v1coincident) {
@@ -3456,8 +3456,8 @@ static int seams_from_islands_exec(bContext *C, wmOperator *op)
 
 	me->drawflag |= ME_DRAWSEAMS;
 
-	EDBM_free_uv_vert_map(vmap);
-	EDBM_free_index_arrays(em);
+	EDBM_uv_vert_map_free(vmap);
+	EDBM_index_arrays_free(em);
 
 	DAG_id_tag_update(&me->id, 0);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, me);
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c
index af87f4d4b07..384581247a0 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.c
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c
@@ -453,7 +453,7 @@ static void stitch_state_delete(StitchState *stitch_state)
 {
 	if (stitch_state) {
 		if (stitch_state->element_map) {
-			EDBM_free_uv_element_map(stitch_state->element_map);
+			EDBM_uv_element_map_free(stitch_state->element_map);
 		}
 		if (stitch_state->uvs) {
 			MEM_freeN(stitch_state->uvs);
@@ -685,7 +685,7 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final)
 		/* copy data from MTFaces to the preview display buffers */
 		BM_ITER(efa, &iter, state->em->bm, BM_FACES_OF_MESH, NULL) {
 			/* just to test if face was added for processing. uvs of inselected vertices will return NULL */
-			UvElement *element = ED_get_uv_element(state->element_map, efa, BM_FACE_FIRST_LOOP(efa));
+			UvElement *element = ED_uv_element_get(state->element_map, efa, BM_FACE_FIRST_LOOP(efa));
 
 			if (element) {
 				int numoftris = efa->len - 2;
@@ -1001,10 +1001,10 @@ static int stitch_init(bContext *C, wmOperator *op)
 	state->midpoints = RNA_boolean_get(op->ptr, "midpoint_snap");
 	/* in uv synch selection, all uv's are visible */
 	if (ts->uv_flag & UV_SYNC_SELECTION) {
-		state->element_map = EDBM_make_uv_element_map(state->em, 0, 1);
+		state->element_map = EDBM_uv_element_map_create(state->em, 0, 1);
 	}
 	else {
-		state->element_map = EDBM_make_uv_element_map(state->em, 1, 1);
+		state->element_map = EDBM_uv_element_map_create(state->em, 1, 1);
 	}
 	if (!state->element_map) {
 		stitch_state_delete(state);
@@ -1063,9 +1063,9 @@ static int stitch_init(bContext *C, wmOperator *op)
 			continue;
 
 		BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
-			UvElement *element = ED_get_uv_element(state->element_map, efa, l);
+			UvElement *element = ED_uv_element_get(state->element_map, efa, l);
 			int offset1, itmp1 = element - state->element_map->buf;
-			int offset2, itmp2 = ED_get_uv_element(state->element_map, efa, l->next) - state->element_map->buf;
+			int offset2, itmp2 = ED_uv_element_get(state->element_map, efa, l->next) - state->element_map->buf;
 
 			offset1 = map[itmp1];
 			offset2 = map[itmp2];
@@ -1157,18 +1157,18 @@ static int stitch_init(bContext *C, wmOperator *op)
 		int faceIndex, elementIndex;
 		UvElement *element;
 
-		EDBM_init_index_arrays(em, 0, 0, 1);
+		EDBM_index_arrays_init(em, 0, 0, 1);
 
 		RNA_BEGIN(op->ptr, itemptr, "selection") {
 			faceIndex = RNA_int_get(&itemptr, "face_index");
 			elementIndex = RNA_int_get(&itemptr, "element_index");
-			efa = EDBM_get_face_for_index(em, faceIndex);
-			element = ED_get_uv_element(state->element_map, efa, BM_iter_at_index(NULL, BM_LOOPS_OF_FACE, efa, elementIndex));
+			efa = EDBM_face_at_index(em, faceIndex);
+			element = ED_uv_element_get(state->element_map, efa, BM_iter_at_index(NULL, BM_LOOPS_OF_FACE, efa, elementIndex));
 			stitch_select_uv(element, state, 1);
 		}
 		RNA_END;
 
-		EDBM_free_index_arrays(em);
+		EDBM_index_arrays_free(em);
 		/* Clear the selection */
 		RNA_collection_clear(op->ptr, "selection");
 
@@ -1178,7 +1178,7 @@ static int stitch_init(bContext *C, wmOperator *op)
 			i = 0;
 			BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 				if (uvedit_uv_selected(em, scene, l)) {
-					UvElement *element = ED_get_uv_element(state->element_map, efa, l);
+					UvElement *element = ED_uv_element_get(state->element_map, efa, l);
 					stitch_select_uv(element, state, 1);
 				}
 				i++;
@@ -1195,7 +1195,7 @@ static int stitch_init(bContext *C, wmOperator *op)
 	}
 
 	BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-		UvElement *element = ED_get_uv_element(state->element_map, efa, BM_FACE_FIRST_LOOP(efa));
+		UvElement *element = ED_uv_element_get(state->element_map, efa, BM_FACE_FIRST_LOOP(efa));
 
 		if (element) {
 			state->tris_per_island[element->island] += (efa->len > 2)? efa->len-2 : 0;
@@ -1313,7 +1313,7 @@ static void stitch_select(bContext *C, Scene *scene, wmEvent *event, StitchState
 		 * you can do stuff like deselect the opposite stitchable vertex and the initial still gets deselected */
 
 		/* This works due to setting of tmp in find nearest uv vert */
-		UvElement *element = ED_get_uv_element(stitch_state->element_map, hit.efa, hit.l);
+		UvElement *element = ED_uv_element_get(stitch_state->element_map, hit.efa, hit.l);
 		stitch_select_uv(element, stitch_state, 0);
 
 	}
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 3c150769e50..ac04e25216d 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -417,11 +417,11 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, BMEditMesh *e
 	faceMap = MEM_mallocN(numOfFaces*sizeof(BMFace *), "unwrap_edit_face_map");
 
 	BM_mesh_elem_index_ensure(em->bm, BM_VERT);
-	EDBM_init_index_arrays(em, 0, 1, 1);
+	EDBM_index_arrays_init(em, 0, 1, 1);
 
 	/* map subsurfed faces to original editFaces */
 	for (i = 0; i < numOfFaces; i++)
-		faceMap[i] = EDBM_get_face_for_index(em, origFaceIndices[i]);
+		faceMap[i] = EDBM_face_at_index(em, origFaceIndices[i]);
 
 	edgeMap = MEM_mallocN(numOfEdges*sizeof(BMEdge *), "unwrap_edit_edge_map");
 
@@ -429,10 +429,10 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, BMEditMesh *e
 	for (i = 0; i < numOfEdges; i++) {
 		/* not all edges correspond to an old edge */
 		edgeMap[i] = (origEdgeIndices[i] != -1)?
-			EDBM_get_edge_for_index(em, origEdgeIndices[i]) : NULL;
+			EDBM_edge_at_index(em, origEdgeIndices[i]) : NULL;
 	}
 
-	EDBM_free_index_arrays(em);
+	EDBM_index_arrays_free(em);
 
 	/* Prepare and feed faces to the solver */
 	for (i = 0; i < numOfFaces; i++) {