2.5

- Depricated another bunch of globals; all the totobj,
  totmesh, totvert, and so on.
- All code that needs such totals now count it themselves,
  these stats were not supposed to be reliable
- Editmesh now stores and manages own totals.
- Todo: make a scene->stats that tracks notifiers.

Bugfix: selecting failed in editmesh, backbuffer stuff was
too late, already using index ranges before it was set.

4 files changed, 7 insertions, 21 deletions

diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index c0604a2b213..4bd9435708d 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -52,7 +52,6 @@ typedef struct Global {
 
 	/* active pointers */
 	struct Main *main;
-	char editModeTitleExtra[64];
 	
 	/* fonts, allocated global data */
 	struct BMF_Font *font, *fonts, *fontss;
@@ -65,12 +64,7 @@ typedef struct Global {
 
 	/* strings of recent opend files */
 	struct ListBase recent_files;
-    
-	/* totals */
-	int totobj, totlamp, totobjsel, totcurve, totmesh;
-	int totbone, totbonesel;
-	int totvert, totedge, totface, totvertsel, totedgesel, totfacesel;
-    
+        
 	short afbreek, moving;
 	short background;
 	short winpos, displaymode;	/* used to be in Render */
@@ -108,10 +102,6 @@ typedef struct Global {
 	/* Janco's playing ground */
 	struct bSoundListener* listener;
 
-	/* Test thingy for Nzc */
-	int compat;      /* toggle compatibility mode for edge rendering */
-	int notonlysolid;/* T-> also edge-render transparent faces       */
-	
 	/* ndof device found ? */
 	int ndofdevice;
 	
diff --git a/source/blender/blenkernel/intern/booleanops.c b/source/blender/blenkernel/intern/booleanops.c
index 51c47746b99..e57dfea8eaf 100644
--- a/source/blender/blenkernel/intern/booleanops.c
+++ b/source/blender/blenkernel/intern/booleanops.c
@@ -268,7 +268,6 @@ static Object *AddNewBlenderMesh(Scene *scene, Base *base)
 				
 	// Initialize the mesh data associated with this object.						
 	ob_new->data= add_mesh("Mesh");
-	G.totmesh++;
 
 	// Finally assign the object type.
 	ob_new->type= OB_MESH;
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index 43056d7f98b..f2bcfdb5065 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -2430,7 +2430,7 @@ static void write_videoscape_mesh(Scene *scene, Object *ob, char *str)
 
 	if(em) {
 
-		fprintf(fp, "%d\n", G.totvert);
+		fprintf(fp, "%d\n", em->totvert);
 	
 		tot= 0;
 		eve= em->verts.first;
@@ -3457,7 +3457,7 @@ static void dxf_get_mesh(Scene *scene, Mesh** m, Object** o, int noob)
 	} 
 	else {
 		*o = NULL;
-		*m = add_mesh("Mesh"); G.totmesh++;
+		*m = add_mesh("Mesh");
 
 		me = *m;
 		ob = *o;
@@ -4650,8 +4650,6 @@ static void dxf_read(Scene *scene, char *filename)
 						ob->dupsta= 1; ob->dupend= 100;
 						ob->recalc= OB_RECALC;	/* needed because of weird way of adding libdata directly */
 						
-						G.totobj++;
-
 						ob->data= obdata;
 						((ID*)ob->data)->us++;
 						
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 02abfb73b96..ae73de892be 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -886,13 +886,13 @@ void *add_wave()
 static void *add_obdata_from_type(int type)
 {
 	switch (type) {
-	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_MESH: return add_mesh("Mesh");
+	case OB_CURVE: return add_curve("Curve", OB_CURVE);
+	case OB_SURF: 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_LAMP: return add_lamp("Lamp");
 	case OB_LATTICE: return add_lattice("Lattice");
 	case OB_WAVE: return add_wave();
 	case OB_ARMATURE: return add_armature("Armature");
@@ -929,7 +929,6 @@ Object *add_only_object(int type, char *name)
 	Object *ob;
 
 	ob= alloc_libblock(&G.main->object, ID_OB, name);
-	G.totobj++;
 
 	/* default object vars */
 	ob->type= type;