Style cleanup: rename BKE_metaball* to BKE_mball -- mball is more commonly used term in Blender

6 files changed, 12 insertions, 12 deletions

diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index fd842ce4f7c..1653a084bf2 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -111,7 +111,7 @@ MetaElem *add_metaball_primitive(bContext *C, float mat[4][4], int type, int UNU
 		ml= ml->next;
 	}
 	
-	ml= BKE_metaball_element_add(mball, type);
+	ml= BKE_mball_element_add(mball, type);
 	copy_v3_v3(&ml->x, mat[3]);
 
 	ml->flag |= SELECT;
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 9506836ab82..5a2370eb518 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1479,7 +1479,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			base->flag &= ~SELECT;
 			ob->flag &= ~SELECT;
 
-			baseob = BKE_metaball_basis_find(scene, ob);
+			baseob = BKE_mball_basis_find(scene, ob);
 
 			if (ob != baseob) {
 				/* if motherball is converting it would be marked as done later */
@@ -1736,7 +1736,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
 				if (dupflag & USER_DUP_MBALL) {
 					ID_NEW_US2(obn->data)
 					else {
-						obn->data = BKE_metaball_copy(obn->data);
+						obn->data = BKE_mball_copy(obn->data);
 						didit = 1;
 					}
 					id->us--;
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 96099d51dc9..d062ea549cb 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -749,7 +749,7 @@ static void copy_texture_space(Object *to, Object *ob)
 		/* pass */
 	}
 	else if (to->type == OB_MBALL) {
-		BKE_metaball_texspace_calc(to);
+		BKE_mball_texspace_calc(to);
 	}
 	else {
 		BKE_curve_texspace_calc(to->data);
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index d31e0b69473..9d4f6326278 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1495,7 +1495,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, int flag)
 						//	ipo_idnew(me->key->ipo);	/* drivers */
 						break;
 					case OB_MBALL:
-						ob->data = BKE_metaball_copy(ob->data);
+						ob->data = BKE_mball_copy(ob->data);
 						break;
 					case OB_CURVE:
 					case OB_SURF:
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 4825697f8c3..34395163ad3 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -867,11 +867,11 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 				MetaBall *mb = ob->data;
 
 				if (centermode == ORIGIN_TO_CURSOR) { /* done */ }
-				else if (around == V3D_CENTROID) { BKE_metaball_center_median(mb, cent); }
-				else { BKE_metaball_center_bounds(mb, cent);    }
+				else if (around == V3D_CENTROID) { BKE_mball_center_median(mb, cent); }
+				else { BKE_mball_center_bounds(mb, cent);    }
 
 				negate_v3_v3(cent_neg, cent);
-				BKE_metaball_translate(mb, cent_neg);
+				BKE_mball_translate(mb, cent_neg);
 
 				tot_change++;
 				mb->id.flag |= LIB_DOIT;
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index b1f86fa5e69..466e9886f19 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3982,7 +3982,7 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 			break;
 		case OB_MBALL:
 
-			if (BKE_metaball_is_basis(ob)) {
+			if (BKE_mball_is_basis(ob)) {
 				lb = &ob->disp;
 				if (lb->first == NULL) makeDispListMBall(scene, ob);
 				if (lb->first == NULL) return 1;
@@ -6159,7 +6159,7 @@ static void draw_bounding_volume(Scene *scene, Object *ob, char type)
 		bb = ob->bb ? ob->bb : ( (Curve *)ob->data)->bb;
 	}
 	else if (ob->type == OB_MBALL) {
-		if (BKE_metaball_is_basis(ob)) {
+		if (BKE_mball_is_basis(ob)) {
 			bb = ob->bb;
 			if (bb == NULL) {
 				makeDispListMBall(scene, ob);
@@ -6250,7 +6250,7 @@ static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
 		}
 	}
 	else if (ob->type == OB_MBALL) {
-		if (BKE_metaball_is_basis(ob)) {
+		if (BKE_mball_is_basis(ob)) {
 			if ((base->flag & OB_FROMDUPLI) == 0)
 				drawDispListwire(&ob->disp);
 		}
@@ -6310,7 +6310,7 @@ static void drawWireExtra(Scene *scene, RegionView3D *rv3d, Object *ob)
 		}
 	}
 	else if (ob->type == OB_MBALL) {
-		if (BKE_metaball_is_basis(ob)) {
+		if (BKE_mball_is_basis(ob)) {
 			drawDispListwire(&ob->disp);
 		}
 	}