[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22817] branches/bmesh/blender/source/ blender/editors/space_info: forgot to bmeshafy the stats code the info window uses after the merge

[Joseph Eagar]

Revision: 22817
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22817
Author:   joeedh
Date:     2009-08-27 10:54:33 +0200 (Thu, 27 Aug 2009)

Log Message:
-----------
forgot to bmeshafy the stats code the info window uses after the merge

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/space_info/Makefile
    branches/bmesh/blender/source/blender/editors/space_info/SConscript
    branches/bmesh/blender/source/blender/editors/space_info/info_stats.c

Modified: branches/bmesh/blender/source/blender/editors/space_info/Makefile
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_info/Makefile	2009-08-27 08:46:39 UTC (rev 22816)
+++ branches/bmesh/blender/source/blender/editors/space_info/Makefile	2009-08-27 08:54:33 UTC (rev 22817)
@@ -47,6 +47,7 @@
 CPPFLAGS += -I../../makesrna
 CPPFLAGS += -I../../imbuf
 CPPFLAGS += -I../../python
+CPPFLAGS += -I../../bmesh
 CPPFLAGS += -I../../blenfont
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 

Modified: branches/bmesh/blender/source/blender/editors/space_info/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_info/SConscript	2009-08-27 08:46:39 UTC (rev 22816)
+++ branches/bmesh/blender/source/blender/editors/space_info/SConscript	2009-08-27 08:54:33 UTC (rev 22817)
@@ -4,7 +4,7 @@
 sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
+incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 
 defs = []
 

Modified: branches/bmesh/blender/source/blender/editors/space_info/info_stats.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_info/info_stats.c	2009-08-27 08:46:39 UTC (rev 22816)
+++ branches/bmesh/blender/source/blender/editors/space_info/info_stats.c	2009-08-27 08:54:33 UTC (rev 22817)
@@ -46,6 +46,7 @@
 #include "BKE_mesh.h"
 #include "BKE_particle.h"
 #include "BKE_utildefines.h"
+#include "BKE_tessmesh.h"
 
 #include "ED_armature.h"
 #include "ED_mesh.h"
@@ -138,26 +139,16 @@
 static void stats_object_edit(Object *obedit, SceneStats *stats)
 {
 	if(obedit->type==OB_MESH) {
-		/* Mesh Edit */
-		EditMesh *em= BKE_mesh_get_editmesh(obedit->data);
-		EditVert *eve;
-		EditEdge *eed;
-		EditFace *efa;
+		BMEditMesh *em = ((Mesh*)obedit->data)->edit_btmesh;
+
+		stats->totvert = em->bm->totvert;
+		stats->totvertsel = em->bm->totvertsel;
 		
-		for(eve= em->verts.first; eve; eve=eve->next) {
-			stats->totvert++;
-			if(eve->f & SELECT) stats->totvertsel++;
-		}
-		for(eed= em->edges.first; eed; eed=eed->next) {
-			stats->totedge++;
-			if(eed->f & SELECT) stats->totedgesel++;
-		}
-		for(efa= em->faces.first; efa; efa=efa->next) {
-			stats->totface++;
-			if(efa->f & SELECT) stats->totfacesel++;
-		}
+		stats->totedge = em->bm->totedge;
+		stats->totedgesel = em->bm->totedgesel;
 		
-		EM_validate_selections(em);
+		stats->totface = em->bm->totface;
+		stats->totfacesel = em->bm->totfacesel;
 	}
 	else if(obedit->type==OB_ARMATURE){
 		/* Armature Edit */