[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44166] branches/bmesh/blender/source/ blender/editors/mesh/editbmesh_add.c: fix [#30141] Add primitive sets only the default name "Mesh"

[Campbell Barton]

Revision: 44166
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44166
Author:   campbellbarton
Date:     2012-02-16 19:13:04 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
fix [#30141] Add primitive sets only the default name "Mesh"

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c

Modified: branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c	2012-02-16 19:00:31 UTC (rev 44165)
+++ branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c	2012-02-16 19:13:04 UTC (rev 44166)
@@ -36,6 +36,7 @@
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
+#include "BKE_library.h"
 #include "BKE_tessmesh.h"
 
 
@@ -76,7 +77,8 @@
 
 /* ********* add primitive operators ************* */
 
-static void make_prim_init(bContext *C, float *dia, float mat[][4], 
+static void make_prim_init(bContext *C, const char *idname,
+                           float *dia, float mat[][4],
 						   int *state, float *loc, float *rot, unsigned int layer)
 {
 	Object *obedit= CTX_data_edit_object(C);
@@ -85,6 +87,9 @@
 	if(obedit==NULL || obedit->type!=OB_MESH) {
 		obedit= ED_object_add_type(C, OB_MESH, loc, rot, FALSE, layer);
 		
+		rename_id((ID *)obedit, idname);
+		rename_id((ID *)obedit->data, idname);
+
 		/* create editmode */
 		ED_object_enter_editmode(C, EM_DO_UNDO|EM_IGNORE_LAYER); /* rare cases the active layer is messed up */
 		*state = 1;
@@ -129,7 +134,7 @@
 	unsigned int layer;
 	
 	ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
-	make_prim_init(C, &dia, mat, &state, loc, rot, layer);
+	make_prim_init(C, "Plane", &dia, mat, &state, loc, rot, layer);
 
 	obedit = CTX_data_edit_object(C);
 	me = obedit->data;
@@ -173,7 +178,7 @@
 	unsigned int layer;
 	
 	ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
-	make_prim_init(C, &dia, mat, &state, loc, rot, layer);
+	make_prim_init(C, "Cube", &dia, mat, &state, loc, rot, layer);
 
 	obedit= CTX_data_edit_object(C);
 	me = obedit->data;
@@ -226,7 +231,7 @@
 	cap_tri = cap_end==2;
 	
 	ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
-	make_prim_init(C, &dia, mat, &state, loc, rot, layer);
+	make_prim_init(C, "Circle", &dia, mat, &state, loc, rot, layer);
 
 	obedit = CTX_data_edit_object(C);
 	me = obedit->data;
@@ -283,7 +288,7 @@
 	cap_tri = cap_end==2;
 	
 	ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
-	make_prim_init(C, &dia, mat, &state, loc, rot, layer);
+	make_prim_init(C, "Cylinder", &dia, mat, &state, loc, rot, layer);
 
 	obedit = CTX_data_edit_object(C);
 	me = obedit->data;
@@ -342,7 +347,7 @@
 	cap_tri = cap_end==2;
 	
 	ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
-	make_prim_init(C, &dia, mat, &state, loc, rot, layer);
+	make_prim_init(C, "Cone", &dia, mat, &state, loc, rot, layer);
 
 	obedit = CTX_data_edit_object(C);
 	me = obedit->data;
@@ -398,7 +403,7 @@
 	unsigned int layer;
 	
 	ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
-	make_prim_init(C, &dia, mat, &state, loc, rot, layer);
+	make_prim_init(C, "Grid", &dia, mat, &state, loc, rot, layer);
 
 	obedit = CTX_data_edit_object(C);
 	me = obedit->data;
@@ -457,7 +462,7 @@
 	if (!view_aligned)
 		rot[0] += M_PI/2.0f;
 	
-	make_prim_init(C, &dia, mat, &state, loc, rot, layer);
+	make_prim_init(C, "Monkey", &dia, mat, &state, loc, rot, layer);
 
 	obedit = CTX_data_edit_object(C);
 	me = obedit->data;
@@ -501,7 +506,7 @@
 	unsigned int layer;
 	
 	ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
-	make_prim_init(C, &dia, mat, &state, loc, rot, layer);
+	make_prim_init(C, "Sphere", &dia, mat, &state, loc, rot, layer);
 
 	obedit = CTX_data_edit_object(C);
 	me = obedit->data;
@@ -555,7 +560,7 @@
 	unsigned int layer;
 	
 	ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
-	make_prim_init(C, &dia, mat, &state, loc, rot, layer);
+	make_prim_init(C, "Icosphere", &dia, mat, &state, loc, rot, layer);
 
 	obedit = CTX_data_edit_object(C);
 	me = obedit->data;