made all data adding functions accept a name such as add_mesh or add_curve, previously only some datatypes adding functions accepted a name.

also updated the Bpy.py epydocs

9 files changed, 28 insertions, 33 deletions

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 2d6c3f58352..f40c6ed9ceb 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -82,11 +82,11 @@ bArmature *get_armature(Object *ob)
 	else return NULL;
 }
 
-bArmature *add_armature()
+bArmature *add_armature(char *name)
 {
 	bArmature *arm;
 	
-	arm= alloc_libblock (&G.main->armature, ID_AR, "Armature");
+	arm= alloc_libblock (&G.main->armature, ID_AR, name);
 	arm->deformflag = ARM_DEF_VGROUP|ARM_DEF_ENVELOPE;
 	arm->layer= 1;
 	return arm;
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index fcdcf847dee..076727093f1 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -112,16 +112,11 @@ void free_curve(Curve *cu)
 	if(cu->tb) MEM_freeN(cu->tb);
 }
 
-Curve *add_curve(int type)
+Curve *add_curve(char *name, int type)
 {
 	Curve *cu;
-	char *str;
-	
-	if(type==OB_CURVE) str= "Curve";
-	else if(type==OB_SURF) str= "Surf";
-	else str= "Text";
 
-	cu= alloc_libblock(&G.main->curve, ID_CU, str);
+	cu= alloc_libblock(&G.main->curve, ID_CU, name);
 	
 	cu->size[0]= cu->size[1]= cu->size[2]= 1.0;
 	cu->flag= CU_FRONT+CU_BACK;
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index 561b80c8e17..6c759276c9c 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -3626,7 +3626,7 @@ static void dxf_get_mesh(Mesh** m, Object** o, int noob)
 	} 
 	else {
 		*o = NULL;
-		*m = add_mesh(); G.totmesh++;
+		*m = add_mesh("Mesh"); G.totmesh++;
 
 		me = *m;
 		ob = *o;
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index f56407af74d..5e6c3370db5 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -105,11 +105,11 @@ void unlink_group(Group *group)
 	group->id.us= 0;
 }
 
-Group *add_group()
+Group *add_group(char *name)
 {
 	Group *group;
 	
-	group = alloc_libblock(&G.main->group, ID_GR, "Group");
+	group = alloc_libblock(&G.main->group, ID_GR, name);
 	group->layer= (1<<20)-1;
 	return group;
 }
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 3eed967c0c9..23a025aaf2b 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -203,11 +203,11 @@ void resizelattice(Lattice *lt, int uNew, int vNew, int wNew, Object *ltOb)
 	MEM_freeN(vertexCos);
 }
 
-Lattice *add_lattice()
+Lattice *add_lattice(char *name)
 {
 	Lattice *lt;
 	
-	lt= alloc_libblock(&G.main->latt, ID_LT, "Lattice");
+	lt= alloc_libblock(&G.main->latt, ID_LT, name);
 	
 	lt->flag= LT_GRID;
 	
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 3c4b1526c8b..2e1efed5b49 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -99,11 +99,11 @@ void free_mball(MetaBall *mb)
 	if(mb->disp.first) freedisplist(&mb->disp);
 }
 
-MetaBall *add_mball()
+MetaBall *add_mball(char *name)
 {
 	MetaBall *mb;
 	
-	mb= alloc_libblock(&G.main->mball, ID_MB, "Meta");
+	mb= alloc_libblock(&G.main->mball, ID_MB, name);
 	
 	mb->size[0]= mb->size[1]= mb->size[2]= 1.0;
 	mb->texflag= MB_AUTOSPACE;
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 829e684ba12..aca86e60d8d 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -228,11 +228,11 @@ void free_dverts(MDeformVert *dvert, int totvert)
 	MEM_freeN (dvert);
 }
 
-Mesh *add_mesh()
+Mesh *add_mesh(char *name)
 {
 	Mesh *me;
 	
-	me= alloc_libblock(&G.main->mesh, ID_ME, "Mesh");
+	me= alloc_libblock(&G.main->mesh, ID_ME, name);
 	
 	me->size[0]= me->size[1]= me->size[2]= 1.0;
 	me->smoothresh= 30;
@@ -852,7 +852,7 @@ void nurbs_to_mesh(Object *ob)
 	}
 
 	/* make mesh */
-	me= add_mesh();
+	me= add_mesh("Mesh");
 	me->totvert= totvert;
 	me->totface= totvlak;
 
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 3ffdbb5c7ed..fe4821c4666 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -489,11 +489,11 @@ int exist_object(Object *obtest)
 	return 0;
 }
 
-void *add_camera()
+void *add_camera(char *name)
 {
 	Camera *cam;
 	
-	cam=  alloc_libblock(&G.main->camera, ID_CA, "Camera");
+	cam=  alloc_libblock(&G.main->camera, ID_CA, name);
 
 	cam->lens= 35.0f;
 	cam->clipsta= 0.1f;
@@ -574,11 +574,11 @@ void make_local_camera(Camera *cam)
 
 
 
-void *add_lamp(void)
+void *add_lamp(char *name)
 {
 	Lamp *la;
 	
-	la=  alloc_libblock(&G.main->lamp, ID_LA, "Lamp");
+	la=  alloc_libblock(&G.main->lamp, ID_LA, name);
 	
 	la->r= la->g= la->b= la->k= 1.0;
 	la->haint= la->energy= 1.0;
@@ -712,16 +712,16 @@ void *add_wave()
 static void *add_obdata_from_type(int type)
 {
 	switch (type) {
-	case OB_MESH: G.totmesh++; return add_mesh();
-	case OB_CURVE: G.totcurve++; return add_curve(OB_CURVE);
-	case OB_SURF: G.totcurve++; return add_curve(OB_SURF);
-	case OB_FONT: return add_curve(OB_FONT);
-	case OB_MBALL: return add_mball();
-	case OB_CAMERA: return add_camera();
-	case OB_LAMP: G.totlamp++; return add_lamp();
-	case OB_LATTICE: return add_lattice();
+	case OB_MESH: G.totmesh++; return add_mesh("Mesh");
+	case OB_CURVE: G.totcurve++; return add_curve("Curve", OB_CURVE);
+	case OB_SURF: G.totcurve++; return add_curve("Surf", OB_SURF);
+	case OB_FONT: return add_curve("Text", OB_FONT);
+	case OB_MBALL: return add_mball("Meta");
+	case OB_CAMERA: return add_camera("Camera");
+	case OB_LAMP: G.totlamp++; return add_lamp("Lamp");
+	case OB_LATTICE: return add_lattice("Lattice");
 	case OB_WAVE: return add_wave();
-	case OB_ARMATURE: return add_armature();
+	case OB_ARMATURE: return add_armature("Armature");
 	case OB_EMPTY: return NULL;
 	default:
 		printf("add_obdata_from_type: Internal error, bad type: %d\n", type);
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 257d0f0862e..e17db258173 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -154,7 +154,7 @@ void free_text(Text *text)
 	if (text->compiled) BPY_free_compiled_text(text);
 }
 
-Text *add_empty_text(void) 
+Text *add_empty_text(char *name) 
 {
 	Text *ta;
 	TextLine *tmp;