code refactor, function renaming for bmesh.

These changes are to make the bmesh api more consistent and easier to learn, grouping similar functions which is convenient for autocomplete.
This uses similar convention to RNA. 

* use face/loop/edge/vert as a prefix for functions.
* use 'elem' as a prefix too for functions that can take any type with a BMHeader.
* changed from camel case to underscore separated (like RNA).

1 files changed, 22 insertions, 22 deletions

diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 8693e3e7d6d..26fbc48d2fb 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -201,17 +201,17 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 
 				poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, efa->len);
 
-				totarea += BM_Compute_Face_Area(em->bm, efa);
+				totarea += BM_face_area_calc(em->bm, efa);
 				//totuvarea += tf_area(tf, efa->v4!=0);
 				totuvarea += poly_uv_area(tf_uv, efa->len);
 				
 				if(uvedit_face_visible(scene, ima, efa, tf)) {
-					BM_SetHFlag(efa, BM_ELEM_TAG);
+					BM_elem_flag_set(efa, BM_ELEM_TAG);
 				}
 				else {
 					if(tf == activetf)
 						activetf= NULL;
-					BM_ClearHFlag(efa, BM_ELEM_TAG);
+					BM_elem_flag_clear(efa, BM_ELEM_TAG);
 				}
 			}
 			
@@ -220,7 +220,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 				col[1] = col[2] = 0.0;
 				glColor3fv(col);
 				BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-					if(BM_TestHFlag(efa, BM_ELEM_TAG)) {
+					if(BM_elem_flag_test(efa, BM_ELEM_TAG)) {
 						glBegin(GL_POLYGON);
 						BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 							luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
@@ -232,8 +232,8 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 			}
 			else {
 				BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-					if(BM_TestHFlag(efa, BM_ELEM_TAG)) {
-						area = BM_Compute_Face_Area(em->bm, efa) / totarea;
+					if(BM_elem_flag_test(efa, BM_ELEM_TAG)) {
+						area = BM_face_area_calc(em->bm, efa) / totarea;
 
 						BLI_array_empty(tf_uv);
 						BLI_array_empty(tf_uvorig);
@@ -518,7 +518,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 
 	em= me->edit_btmesh;
 	activetf= EDBM_get_active_mtexpoly(em, &efa_act, FALSE); /* will be set to NULL if hidden */
-	activef = BM_get_actFace(em->bm, FALSE);
+	activef = BM_active_face_get(em->bm, FALSE);
 	ts= scene->toolsettings;
 
 	drawfaces= draw_uvs_face_check(scene);
@@ -569,7 +569,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 			tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
 			
 			if(uvedit_face_visible(scene, ima, efa, tf)) {
-				BM_SetHFlag(efa, BM_ELEM_TAG);
+				BM_elem_flag_set(efa, BM_ELEM_TAG);
 				if(tf==activetf) continue; /* important the temp boolean is set above */
 
 				if(uvedit_face_selected(scene, em, efa))
@@ -587,7 +587,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 			else {
 				if(tf == activetf)
 					activetf= NULL;
-				BM_ClearHFlag(efa, BM_ELEM_TAG);
+				BM_elem_flag_clear(efa, BM_ELEM_TAG);
 			}
 		}
 		glDisable(GL_BLEND);
@@ -599,12 +599,12 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 			tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
 
 			if(uvedit_face_visible(scene, ima, efa, tf)) {		
-				BM_SetHFlag(efa, BM_ELEM_TAG);
+				BM_elem_flag_set(efa, BM_ELEM_TAG);
 			}
 			else {
 				if(tf == activetf)
 					activetf= NULL;
-				BM_ClearHFlag(efa, BM_ELEM_TAG);
+				BM_elem_flag_clear(efa, BM_ELEM_TAG);
 			}
 		}
 		
@@ -642,7 +642,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 	switch(sima->dt_uv) {
 		case SI_UVDT_DASH:
 			BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-				if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+				if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 					continue;
 				tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
 
@@ -683,7 +683,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 			else glColor3f(0.0f, 0.0f, 0.0f);
 
 			BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-				if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+				if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 					continue;
 
 				glBegin(GL_LINE_LOOP);
@@ -699,7 +699,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 			cpack(0x0);
 			
 			BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-				if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+				if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 					continue;
 
 				glBegin(GL_LINE_LOOP);
@@ -722,7 +722,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 					glShadeModel(GL_SMOOTH);
 
 					BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-						if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+						if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 							continue;
 
 						glBegin(GL_LINE_LOOP);
@@ -740,7 +740,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 				}
 				else {
 					BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-						if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+						if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 							continue;
 
 						glBegin(GL_LINES);
@@ -762,7 +762,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 			else {
 				/* no nice edges */
 				BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-					if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+					if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 						continue;
 				
 					glBegin(GL_LINE_LOOP);
@@ -795,7 +795,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 
 		bglBegin(GL_POINTS);
 		BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-			if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 				continue;
 
 			if(!uvedit_face_selected(scene, em, efa)) {
@@ -810,7 +810,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 
 		bglBegin(GL_POINTS);
 		BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-			if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 				continue;
 
 			if(uvedit_face_selected(scene, em, efa)) {
@@ -831,7 +831,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 	
 		bglBegin(GL_POINTS);
 		BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-			if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 				continue;
 
 			BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
@@ -849,7 +849,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 	
 		bglBegin(GL_POINTS);
 		BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-			if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 				continue;
 
 			BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
@@ -867,7 +867,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 	
 		bglBegin(GL_POINTS);
 		BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-			if (!BM_TestHFlag(efa, BM_ELEM_TAG))
+			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 				continue;
 
 			BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {