move bmesh array lookup data and utility functions from editmesh into bmesh,

since enough bmesh operations can also take advantage of direct index lookups on verts/edges/faces.

developers note:
- EDBM_index_arrays_init/ensure/free -> BM_mesh_elem_table_ensure/init/free
- EDBM_vert/edge/face_at_index -> BM_vert/edge/face_at_index
- EDBM_uv_element_map_create/free -> BM_uv_element_map_create/free
- ED_uv_element_get -> BM_uv_element_get

3 files changed, 46 insertions, 46 deletions

diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 8c299cccbc2..474348e84bc 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -924,7 +924,7 @@ static void uv_select_edgeloop_vertex_loop_flag(UvMapVert *first)
 static UvMapVert *uv_select_edgeloop_vertex_map_get(UvVertMap *vmap, BMFace *efa, BMLoop *l)
 {
 	UvMapVert *iterv, *first;
-	first = EDBM_uv_vert_map_at_index(vmap,  BM_elem_index_get(l->v));
+	first = BM_uv_vert_map_at_index(vmap,  BM_elem_index_get(l->v));
 
 	for (iterv = first; iterv; iterv = iterv->next) {
 		if (iterv->separate)
@@ -953,7 +953,7 @@ static bool uv_select_edgeloop_edge_tag_faces(BMEditMesh *em, UvMapVert *first1,
 
 			if (iterv1->f == iterv2->f) {
 				/* if face already tagged, don't do this edge */
-				efa = EDBM_face_at_index(em, iterv1->f);
+				efa = BM_face_at_index(em->bm, iterv1->f);
 				if (BM_elem_flag_test(efa, BM_ELEM_TAG))
 					return false;
 
@@ -978,7 +978,7 @@ static bool uv_select_edgeloop_edge_tag_faces(BMEditMesh *em, UvMapVert *first1,
 				break;
 
 			if (iterv1->f == iterv2->f) {
-				efa = EDBM_face_at_index(em, iterv1->f);
+				efa = BM_face_at_index(em->bm, iterv1->f);
 				BM_elem_flag_enable(efa, BM_ELEM_TAG);
 				break;
 			}
@@ -1005,8 +1005,8 @@ static int uv_select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestH
 	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	/* setup */
-	EDBM_index_arrays_ensure(em, BM_FACE);
-	vmap = EDBM_uv_vert_map_create(em, 0, limit);
+	BM_mesh_elem_table_ensure(em->bm, BM_FACE);
+	vmap = BM_uv_vert_map_create(em->bm, 0, limit);
 
 	BM_mesh_elem_index_ensure(em->bm, BM_VERT | BM_FACE);
 
@@ -1085,7 +1085,7 @@ static int uv_select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestH
 	}
 
 	/* cleanup */
-	EDBM_uv_vert_map_free(vmap);
+	BM_uv_vert_map_free(vmap);
 
 	return (select) ? 1 : -1;
 }
@@ -1108,8 +1108,8 @@ static void uv_select_linked(Scene *scene, Image *ima, BMEditMesh *em, const flo
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
-	EDBM_index_arrays_ensure(em, BM_FACE); /* we can use this too */
-	vmap = EDBM_uv_vert_map_create(em, 1, limit);
+	BM_mesh_elem_table_ensure(em->bm, BM_FACE); /* we can use this too */
+	vmap = BM_uv_vert_map_create(em->bm, 1, limit);
 
 	if (vmap == NULL)
 		return;
@@ -1152,12 +1152,12 @@ static void uv_select_linked(Scene *scene, Image *ima, BMEditMesh *em, const flo
 		stacksize--;
 		a = stack[stacksize];
 
-		efa = EDBM_face_at_index(em, a);
+		efa = BM_face_at_index(em->bm, a);
 
 		BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
 
 			/* make_uv_vert_map_EM sets verts tmp.l to the indices */
-			vlist = EDBM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v));
+			vlist = BM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v));
 			
 			startv = vlist;
 
@@ -1241,7 +1241,7 @@ static void uv_select_linked(Scene *scene, Image *ima, BMEditMesh *em, const flo
 	
 	MEM_freeN(stack);
 	MEM_freeN(flag);
-	EDBM_uv_vert_map_free(vmap);
+	BM_uv_vert_map_free(vmap);
 }
 
 /* WATCH IT: this returns first selected UV,
@@ -2567,7 +2567,7 @@ static void uv_select_flush_from_tag_sticky_loc_internal(Scene *scene, BMEditMes
 
 	uvedit_uv_select_set(em, scene, l, select, false, cd_loop_uv_offset);
 
-	vlist_iter = EDBM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v));
+	vlist_iter = BM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v));
 
 	while (vlist_iter) {
 		if (vlist_iter->separate)
@@ -2587,7 +2587,7 @@ static void uv_select_flush_from_tag_sticky_loc_internal(Scene *scene, BMEditMes
 
 		if (efa_index != vlist_iter->f) {
 			BMLoop *l_other;
-			efa_vlist = EDBM_face_at_index(em, vlist_iter->f);
+			efa_vlist = BM_face_at_index(em->bm, vlist_iter->f);
 			/* tf_vlist = BM_ELEM_CD_GET_VOID_P(efa_vlist, cd_poly_tex_offset); */ /* UNUSED */
 
 			l_other = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa_vlist, vlist_iter->tfindex);
@@ -2657,8 +2657,8 @@ static void uv_select_flush_from_tag_face(SpaceImage *sima, Scene *scene, Object
 		
 		uvedit_pixel_to_float(sima, limit, 0.05);
 		
-		EDBM_index_arrays_ensure(em, BM_FACE);
-		vmap = EDBM_uv_vert_map_create(em, 0, limit);
+		BM_mesh_elem_table_ensure(em->bm, BM_FACE);
+		vmap = BM_uv_vert_map_create(em->bm, 0, limit);
 		if (vmap == NULL) {
 			return;
 		}
@@ -2673,7 +2673,7 @@ static void uv_select_flush_from_tag_face(SpaceImage *sima, Scene *scene, Object
 				}
 			}
 		}
-		EDBM_uv_vert_map_free(vmap);
+		BM_uv_vert_map_free(vmap);
 		
 	}
 	else { /* SI_STICKY_DISABLE or ts->uv_flag & UV_SYNC_SELECTION */
@@ -2748,8 +2748,8 @@ static void uv_select_flush_from_tag_loop(SpaceImage *sima, Scene *scene, Object
 
 		uvedit_pixel_to_float(sima, limit, 0.05);
 
-		EDBM_index_arrays_ensure(em, BM_FACE);
-		vmap = EDBM_uv_vert_map_create(em, 0, limit);
+		BM_mesh_elem_table_ensure(em->bm, BM_FACE);
+		vmap = BM_uv_vert_map_create(em->bm, 0, limit);
 		if (vmap == NULL) {
 			return;
 		}
@@ -2764,7 +2764,7 @@ static void uv_select_flush_from_tag_loop(SpaceImage *sima, Scene *scene, Object
 				}
 			}
 		}
-		EDBM_uv_vert_map_free(vmap);
+		BM_uv_vert_map_free(vmap);
 
 	}
 	else { /* SI_STICKY_DISABLE or ts->uv_flag & UV_SYNC_SELECTION */
@@ -3963,8 +3963,8 @@ static int uv_seams_from_islands_exec(bContext *C, wmOperator *op)
 	}
 
 	/* This code sets editvert->tmp.l to the index. This will be useful later on. */
-	EDBM_index_arrays_ensure(em, BM_FACE);
-	vmap = EDBM_uv_vert_map_create(em, 0, limit);
+	BM_mesh_elem_table_ensure(bm, BM_FACE);
+	vmap = BM_uv_vert_map_create(bm, 0, limit);
 
 	BM_ITER_MESH (editedge, &iter, bm, BM_EDGES_OF_MESH) {
 		/* flags to determine if we uv is separated from first editface match */
@@ -3992,14 +3992,14 @@ static int uv_seams_from_islands_exec(bContext *C, wmOperator *op)
 				v1coincident = 0;
 
 			separated2 = 0;
-			efa1 = EDBM_face_at_index(em, mv1->f);
+			efa1 = BM_face_at_index(bm, 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_face_at_index(em, mv2->f);
+				efa2 = BM_face_at_index(bm, mv2->f);
 				if (efa1 == efa2) {
 					/* if v1 is not coincident no point in comparing */
 					if (v1coincident) {
@@ -4042,7 +4042,7 @@ static int uv_seams_from_islands_exec(bContext *C, wmOperator *op)
 
 	me->drawflag |= ME_DRAWSEAMS;
 
-	EDBM_uv_vert_map_free(vmap);
+	BM_uv_vert_map_free(vmap);
 
 	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 f788c6a772c..4b5d6d55aa0 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.c
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c
@@ -600,7 +600,7 @@ static void state_delete(StitchState *state)
 {
 	if (state) {
 		if (state->element_map) {
-			EDBM_uv_element_map_free(state->element_map);
+			BM_uv_element_map_free(state->element_map);
 		}
 		if (state->uvs) {
 			MEM_freeN(state->uvs);
@@ -661,9 +661,9 @@ static void stitch_uv_edge_generate_linked_edges(GHash *edge_hash, StitchState *
 
 				/* check to see if other vertex of edge belongs to same vertex as */
 				if (BM_elem_index_get(iter1->l->next->v) == elemindex2)
-					iter2 = ED_uv_element_get(element_map, iter1->l->f, iter1->l->next);
+					iter2 = BM_uv_element_get(element_map, iter1->l->f, iter1->l->next);
 				else if (BM_elem_index_get(iter1->l->prev->v) == elemindex2)
-					iter2 = ED_uv_element_get(element_map, iter1->l->f, iter1->l->prev);
+					iter2 = BM_uv_element_get(element_map, iter1->l->f, iter1->l->prev);
 
 				if (iter2) {
 					int index1 = map[iter1 - first_element];
@@ -1017,7 +1017,7 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final)
 		/* copy data from MLoopUVs to the preview display buffers */
 		BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 			/* just to test if face was added for processing. uvs of inselected vertices will return NULL */
-			UvElement *element = ED_uv_element_get(state->element_map, efa, BM_FACE_FIRST_LOOP(efa));
+			UvElement *element = BM_uv_element_get(state->element_map, efa, BM_FACE_FIRST_LOOP(efa));
 
 			if (element) {
 				int numoftris = efa->len - 2;
@@ -1568,8 +1568,8 @@ static UvEdge *uv_edge_get(BMLoop *l, StitchState *state)
 {
 	UvEdge tmp_edge;
 
-	UvElement *element1 = ED_uv_element_get(state->element_map, l->f, l);
-	UvElement *element2 = ED_uv_element_get(state->element_map, l->f, l->next);
+	UvElement *element1 = BM_uv_element_get(state->element_map, l->f, l);
+	UvElement *element2 = BM_uv_element_get(state->element_map, l->f, l->next);
 
 	int uv1 = state->map[element1 - state->element_map->buf];
 	int uv2 = state->map[element2 - state->element_map->buf];
@@ -1651,10 +1651,10 @@ static int stitch_init(bContext *C, wmOperator *op)
 	state->draw_handle = ED_region_draw_cb_activate(ar->type, stitch_draw, state, REGION_DRAW_POST_VIEW);
 	/* in uv synch selection, all uv's are visible */
 	if (ts->uv_flag & UV_SYNC_SELECTION) {
-		state->element_map = EDBM_uv_element_map_create(state->em, FALSE, TRUE);
+		state->element_map = BM_uv_element_map_create(state->em->bm, false, true);
 	}
 	else {
-		state->element_map = EDBM_uv_element_map_create(state->em, TRUE, TRUE);
+		state->element_map = BM_uv_element_map_create(state->em->bm, true, true);
 	}
 	if (!state->element_map) {
 		state_delete(state);
@@ -1715,9 +1715,9 @@ static int stitch_init(bContext *C, wmOperator *op)
 			continue;
 
 		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-			UvElement *element = ED_uv_element_get(state->element_map, efa, l);
+			UvElement *element = BM_uv_element_get(state->element_map, efa, l);
 			int offset1, itmp1 = element - state->element_map->buf;
-			int offset2, itmp2 = ED_uv_element_get(state->element_map, efa, l->next) - state->element_map->buf;
+			int offset2, itmp2 = BM_uv_element_get(state->element_map, efa, l->next) - state->element_map->buf;
 			UvEdge *edge;
 
 			offset1 = map[itmp1];
@@ -1814,7 +1814,7 @@ static int stitch_init(bContext *C, wmOperator *op)
 		UvElement *element;
 		enum StitchModes stored_mode = RNA_enum_get(op->ptr, "stored_mode");
 
-		EDBM_index_arrays_ensure(em, BM_FACE);
+		BM_mesh_elem_table_ensure(em->bm, BM_FACE);
 
 		if (stored_mode == STITCH_VERT) {
 			state->selection_stack = MEM_mallocN(sizeof(*state->selection_stack) * state->total_separate_uvs, "uv_stitch_selection_stack");
@@ -1823,8 +1823,8 @@ static int stitch_init(bContext *C, wmOperator *op)
 			{
 				faceIndex = RNA_int_get(&itemptr, "face_index");
 				elementIndex = RNA_int_get(&itemptr, "element_index");
-				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));
+				efa = BM_face_at_index(em->bm, faceIndex);
+				element = BM_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;
@@ -1838,11 +1838,11 @@ static int stitch_init(bContext *C, wmOperator *op)
 				int uv1, uv2;
 				faceIndex = RNA_int_get(&itemptr, "face_index");
 				elementIndex = RNA_int_get(&itemptr, "element_index");
-				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));
+				efa = BM_face_at_index(em->bm, faceIndex);
+				element = BM_uv_element_get(state->element_map, efa, BM_iter_at_index(NULL, BM_LOOPS_OF_FACE, efa, elementIndex));
 				uv1 = map[element - state->element_map->buf];
 
-				element = ED_uv_element_get(state->element_map, efa, BM_iter_at_index(NULL, BM_LOOPS_OF_FACE, efa, (elementIndex + 1) % efa->len));
+				element = BM_uv_element_get(state->element_map, efa, BM_iter_at_index(NULL, BM_LOOPS_OF_FACE, efa, (elementIndex + 1) % efa->len));
 				uv2 = map[element - state->element_map->buf];
 
 				if (uv1 < uv2) {
@@ -1877,7 +1877,7 @@ static int stitch_init(bContext *C, wmOperator *op)
 			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
 				BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
 					if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
-						UvElement *element = ED_uv_element_get(state->element_map, efa, l);
+						UvElement *element = BM_uv_element_get(state->element_map, efa, l);
 						if (element) {
 							stitch_select_uv(element, state, 1);
 						}
@@ -1913,7 +1913,7 @@ static int stitch_init(bContext *C, wmOperator *op)
 	}
 
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		UvElement *element = ED_uv_element_get(state->element_map, efa, BM_FACE_FIRST_LOOP(efa));
+		UvElement *element = BM_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;
@@ -2039,7 +2039,7 @@ static void stitch_select(bContext *C, Scene *scene, const wmEvent *event, Stitc
 			 * 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_uv_element_get(state->element_map, hit.efa, hit.l);
+			UvElement *element = BM_uv_element_get(state->element_map, hit.efa, hit.l);
 			stitch_select_uv(element, state, FALSE);
 
 		}
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 0f42808b2d0..06ffdea96bf 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -421,11 +421,11 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, Object *ob, B
 	faceMap = MEM_mallocN(numOfFaces * sizeof(BMFace *), "unwrap_edit_face_map");
 
 	BM_mesh_elem_index_ensure(em->bm, BM_VERT);
-	EDBM_index_arrays_ensure(em, BM_EDGE | BM_FACE);
+	BM_mesh_elem_table_ensure(em->bm, BM_EDGE | BM_FACE);
 
 	/* map subsurfed faces to original editFaces */
 	for (i = 0; i < numOfFaces; i++)
-		faceMap[i] = EDBM_face_at_index(em, DM_origindex_mface_mpoly(origFaceIndices, origPolyIndices, i));
+		faceMap[i] = BM_face_at_index(em->bm, DM_origindex_mface_mpoly(origFaceIndices, origPolyIndices, i));
 
 	edgeMap = MEM_mallocN(numOfEdges * sizeof(BMEdge *), "unwrap_edit_edge_map");
 
@@ -433,7 +433,7 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, Object *ob, B
 	for (i = 0; i < numOfEdges; i++) {
 		/* not all edges correspond to an old edge */
 		edgeMap[i] = (origEdgeIndices[i] != ORIGINDEX_NONE) ?
-		             EDBM_edge_at_index(em, origEdgeIndices[i]) : NULL;
+		             BM_edge_at_index(em->bm, origEdgeIndices[i]) : NULL;
 	}
 
 	/* Prepare and feed faces to the solver */