[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46376] trunk/blender/source/blender: Style cleanup: rename BKE_metaball* to BKE_mball -- mball is more commonly used term in Blender

Sergey Sharybin sergey.vfx at gmail.com
Mon May 7 08:38:41 CEST 2012


Revision: 46376
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46376
Author:   nazgul
Date:     2012-05-07 06:38:41 +0000 (Mon, 07 May 2012)
Log Message:
-----------
Style cleanup: rename BKE_metaball* to BKE_mball -- mball is more commonly used term in Blender

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_mball.h
    trunk/blender/source/blender/blenkernel/intern/depsgraph.c
    trunk/blender/source/blender/blenkernel/intern/displist.c
    trunk/blender/source/blender/blenkernel/intern/library.c
    trunk/blender/source/blender/blenkernel/intern/mball.c
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/editors/metaball/mball_edit.c
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/editors/object/object_edit.c
    trunk/blender/source/blender/editors/object/object_relations.c
    trunk/blender/source/blender/editors/object/object_transform.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c
    trunk/blender/source/blender/makesrna/intern/rna_main_api.c
    trunk/blender/source/blender/makesrna/intern/rna_meta.c
    trunk/blender/source/blender/makesrna/intern/rna_object_api.c
    trunk/blender/source/blender/render/intern/source/convertblender.c
    trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c

Modified: trunk/blender/source/blender/blenkernel/BKE_mball.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mball.h	2012-05-07 06:32:14 UTC (rev 46375)
+++ trunk/blender/source/blender/blenkernel/BKE_mball.h	2012-05-07 06:38:41 UTC (rev 46376)
@@ -37,30 +37,30 @@
 struct Scene;
 struct MetaElem;
 
-void BKE_metaball_unlink(struct MetaBall *mb);
-void BKE_metaball_free(struct MetaBall *mb);
-struct MetaBall *BKE_metaball_add(const char *name);
-struct MetaBall *BKE_metaball_copy(struct MetaBall *mb);
+void BKE_mball_unlink(struct MetaBall *mb);
+void BKE_mball_free(struct MetaBall *mb);
+struct MetaBall *BKE_mball_add(const char *name);
+struct MetaBall *BKE_mball_copy(struct MetaBall *mb);
 
-void BKE_metaball_make_local(struct MetaBall *mb);
+void BKE_mball_make_local(struct MetaBall *mb);
 
-void BKE_metaball_cubeTable_free(void);
+void BKE_mball_cubeTable_free(void);
 
-void BKE_metaball_polygonize(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
-int BKE_metaball_is_basis_for(struct Object *ob1, struct Object *ob2);
-int BKE_metaball_is_basis(struct Object *ob);
-struct Object *BKE_metaball_basis_find(struct Scene *scene, struct Object *ob);
+void BKE_mball_polygonize(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
+int BKE_mball_is_basis_for(struct Object *ob1, struct Object *ob2);
+int BKE_mball_is_basis(struct Object *ob);
+struct Object *BKE_mball_basis_find(struct Scene *scene, struct Object *ob);
 
-void BKE_metaball_texspace_calc(struct Object *ob);
-float *BKE_metaball_make_orco(struct Object *ob, struct ListBase *dispbase);
+void BKE_mball_texspace_calc(struct Object *ob);
+float *BKE_mball_make_orco(struct Object *ob, struct ListBase *dispbase);
 
-void BKE_metaball_properties_copy(struct Scene *scene, struct Object *active_object);
+void BKE_mball_properties_copy(struct Scene *scene, struct Object *active_object);
 
-int BKE_metaball_minmax(struct MetaBall *mb, float min[3], float max[3]);
-int BKE_metaball_center_median(struct MetaBall *mb, float cent[3]);
-int BKE_metaball_center_bounds(struct MetaBall *mb, float cent[3]);
-void BKE_metaball_translate(struct MetaBall *mb, float offset[3]);
+int BKE_mball_minmax(struct MetaBall *mb, float min[3], float max[3]);
+int BKE_mball_center_median(struct MetaBall *mb, float cent[3]);
+int BKE_mball_center_bounds(struct MetaBall *mb, float cent[3]);
+void BKE_mball_translate(struct MetaBall *mb, float offset[3]);
 
-struct MetaElem *BKE_metaball_element_add(struct MetaBall *mb, const int type);
+struct MetaElem *BKE_mball_element_add(struct MetaBall *mb, const int type);
 
 #endif

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2012-05-07 06:32:14 UTC (rev 46375)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2012-05-07 06:38:41 UTC (rev 46376)
@@ -540,7 +540,7 @@
 		break;
 		case OB_MBALL: 
 		{
-			Object *mom = BKE_metaball_basis_find(scene, ob);
+			Object *mom = BKE_mball_basis_find(scene, ob);
 			
 			if (mom != ob) {
 				node2 = dag_get_node(dag, mom);

Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c	2012-05-07 06:32:14 UTC (rev 46375)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c	2012-05-07 06:38:41 UTC (rev 46376)
@@ -672,9 +672,9 @@
 	freedisplist(&(ob->disp));
 
 	if (ob->type == OB_MBALL) {
-		if (ob == BKE_metaball_basis_find(scene, ob)) {
-			BKE_metaball_polygonize(scene, ob, &ob->disp);
-			BKE_metaball_texspace_calc(ob);
+		if (ob == BKE_mball_basis_find(scene, ob)) {
+			BKE_mball_polygonize(scene, ob, &ob->disp);
+			BKE_mball_texspace_calc(ob);
 
 			object_deform_mball(ob, &ob->disp);
 		}
@@ -685,8 +685,8 @@
 
 void makeDispListMBall_forRender(Scene *scene, Object *ob, ListBase *dispbase)
 {
-	BKE_metaball_polygonize(scene, ob, dispbase);
-	BKE_metaball_texspace_calc(ob);
+	BKE_mball_polygonize(scene, ob, dispbase);
+	BKE_mball_texspace_calc(ob);
 	
 	object_deform_mball(ob, dispbase);
 }

Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c	2012-05-07 06:32:14 UTC (rev 46375)
+++ trunk/blender/source/blender/blenkernel/intern/library.c	2012-05-07 06:38:41 UTC (rev 46376)
@@ -203,7 +203,7 @@
 			}
 			return 1;
 		case ID_MB:
-			if (!test) BKE_metaball_make_local((MetaBall *)id);
+			if (!test) BKE_mball_make_local((MetaBall *)id);
 			return 1;
 		case ID_MA:
 			if (!test) BKE_material_make_local((Material *)id);
@@ -294,7 +294,7 @@
 			if (!test) *newid = (ID *)BKE_curve_copy((Curve *)id);
 			return 1;
 		case ID_MB:
-			if (!test) *newid = (ID *)BKE_metaball_copy((MetaBall *)id);
+			if (!test) *newid = (ID *)BKE_mball_copy((MetaBall *)id);
 			return 1;
 		case ID_MA:
 			if (!test) *newid = (ID *)BKE_material_copy((Material *)id);
@@ -813,7 +813,7 @@
 			BKE_curve_free((Curve *)id);
 			break;
 		case ID_MB:
-			BKE_metaball_free((MetaBall *)id);
+			BKE_mball_free((MetaBall *)id);
 			break;
 		case ID_MA:
 			BKE_material_free((Material *)id);

Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c	2012-05-07 06:32:14 UTC (rev 46375)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c	2012-05-07 06:38:41 UTC (rev 46376)
@@ -173,7 +173,7 @@
 static octal_tree *metaball_tree = NULL;
 /* Functions */
 
-void BKE_metaball_unlink(MetaBall *mb)
+void BKE_mball_unlink(MetaBall *mb)
 {
 	int a;
 	
@@ -185,9 +185,9 @@
 
 
 /* do not free mball itself */
-void BKE_metaball_free(MetaBall *mb)
+void BKE_mball_free(MetaBall *mb)
 {
-	BKE_metaball_unlink(mb);	
+	BKE_mball_unlink(mb);	
 	
 	if (mb->adt) {
 		BKE_free_animdata((ID *)mb);
@@ -199,7 +199,7 @@
 	if (mb->disp.first) freedisplist(&mb->disp);
 }
 
-MetaBall *BKE_metaball_add(const char *name)
+MetaBall *BKE_mball_add(const char *name)
 {
 	MetaBall *mb;
 	
@@ -215,7 +215,7 @@
 	return mb;
 }
 
-MetaBall *BKE_metaball_copy(MetaBall *mb)
+MetaBall *BKE_mball_copy(MetaBall *mb)
 {
 	MetaBall *mbn;
 	int a;
@@ -243,7 +243,7 @@
 	}
 }
 
-void BKE_metaball_make_local(MetaBall *mb)
+void BKE_mball_make_local(MetaBall *mb)
 {
 	Main *bmain = G.main;
 	Object *ob;
@@ -274,7 +274,7 @@
 		extern_local_mball(mb);
 	}
 	else if (is_local && is_lib) {
-		MetaBall *mb_new = BKE_metaball_copy(mb);
+		MetaBall *mb_new = BKE_mball_copy(mb);
 		mb_new->id.us = 0;
 
 		/* Remap paths of new ID using old library as base. */
@@ -294,7 +294,7 @@
 
 /* most simple meta-element adding function
  * don't do context manipulation here (rna uses) */
-MetaElem *BKE_metaball_element_add(MetaBall *mb, const int type)
+MetaElem *BKE_mball_element_add(MetaBall *mb, const int type)
 {
 	MetaElem *ml = MEM_callocN(sizeof(MetaElem), "metaelem");
 
@@ -346,7 +346,7 @@
  * basic MetaBall (usually with name Meta). All other MetaBalls (with
  * names Meta.001, Meta.002, etc) are included in this Bounding Box.
  */
-void BKE_metaball_texspace_calc(Object *ob)
+void BKE_mball_texspace_calc(Object *ob)
 {
 	DispList *dl;
 	BoundBox *bb;
@@ -390,7 +390,7 @@
 	BKE_boundbox_init_from_minmax(bb, min, max);
 }
 
-float *BKE_metaball_make_orco(Object *ob, ListBase *dispbase)
+float *BKE_mball_make_orco(Object *ob, ListBase *dispbase)
 {
 	BoundBox *bb;
 	DispList *dl;
@@ -442,7 +442,7 @@
  * It test last character of Object ID name. If last character
  * is digit it return 0, else it return 1.
  */
-int BKE_metaball_is_basis(Object *ob)
+int BKE_mball_is_basis(Object *ob)
 {
 	int len;
 	
@@ -453,7 +453,7 @@
 }
 
 /* return nonzero if ob1 is a basis mball for ob */
-int BKE_metaball_is_basis_for(Object *ob1, Object *ob2)
+int BKE_mball_is_basis_for(Object *ob1, Object *ob2)
 {
 	int basis1nr, basis2nr;
 	char basis1name[MAX_ID_NAME], basis2name[MAX_ID_NAME];
@@ -461,7 +461,7 @@
 	BLI_split_name_num(basis1name, &basis1nr, ob1->id.name + 2, '.');
 	BLI_split_name_num(basis2name, &basis2nr, ob2->id.name + 2, '.');
 
-	if (!strcmp(basis1name, basis2name)) return BKE_metaball_is_basis(ob1);
+	if (!strcmp(basis1name, basis2name)) return BKE_mball_is_basis(ob1);
 	else return 0;
 }
 
@@ -471,7 +471,7 @@
  * are copied to all metaballs in same "group" (metaballs with same base name: MBall,
  * MBall.001, MBall.002, etc). The most important is to copy properties to the base metaball,
  * because this metaball influence polygonisation of metaballs. */
-void BKE_metaball_properties_copy(Scene *scene, Object *active_object)
+void BKE_mball_properties_copy(Scene *scene, Object *active_object)
 {
 	Scene *sce_iter = scene;
 	Base *base;
@@ -516,7 +516,7 @@
  *
  * warning!, is_basis_mball() can fail on returned object, see long note above.
  */
-Object *BKE_metaball_basis_find(Scene *scene, Object *basis)
+Object *BKE_mball_basis_find(Scene *scene, Object *basis)
 {
 	Scene *sce_iter = scene;
 	Base *base;
@@ -1174,7 +1174,7 @@
 	}
 }
 
-void BKE_metaball_cubeTable_free(void)
+void BKE_mball_cubeTable_free(void)
 {
 	int i;
 	INTLISTS *lists, *nlists;
@@ -2277,7 +2277,7 @@
 	subdivide_metaball_octal_node(node, size[0], size[1], size[2], metaball_tree->depth);
 }
 
-void BKE_metaball_polygonize(Scene *scene, Object *ob, ListBase *dispbase)
+void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase)
 {
 	PROCESS mbproc;
 	MetaBall *mb;
@@ -2390,7 +2390,7 @@
 }
 
 /* basic vertex data functions */
-int BKE_metaball_minmax(MetaBall *mb, float min[3], float max[3])
+int BKE_mball_minmax(MetaBall *mb, float min[3], float max[3])
 {
 	MetaElem *ml;
 
@@ -2403,7 +2403,7 @@
 	return (mb->elems.first != NULL);
 }
 
-int BKE_metaball_center_median(MetaBall *mb, float cent[3])
+int BKE_mball_center_median(MetaBall *mb, float cent[3])
 {
 	MetaElem *ml;
 	int total = 0;
@@ -2420,11 +2420,11 @@
 	return (total != 0);
 }
 
-int BKE_metaball_center_bounds(MetaBall *mb, float cent[3])
+int BKE_mball_center_bounds(MetaBall *mb, float cent[3])
 {
 	float min[3], max[3];
 
-	if (BKE_metaball_minmax(mb, min, max)) {
+	if (BKE_mball_minmax(mb, min, max)) {
 		mid_v3_v3v3(cent, min, max);
 		return 1;
 	}
@@ -2432,7 +2432,7 @@
 	return 0;
 }
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list