sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Brought back (lost with modifier code) display of actual amount of faces

Browse Source 
for subsurfs in info header.
This commit is contained in:
Ton Roosendaal 2005-09-28 11:24:39 +00:00
parent 7382a3d9d9
commit 2a08be6e50
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/src/buttons_editing.c
View File

@ -748,6 +748,7 @@ void do_modifier_panels(unsigned short event)
allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWVIEW3D, 0);
allqueue(REDRAWIMAGE, 0); allqueue(REDRAWIMAGE, 0);
allqueue(REDRAWOOPS, 0); allqueue(REDRAWOOPS, 0);
countall();
DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
break; break;
} }

16
source/blender/src/edit.c
View File

@ -56,6 +56,7 @@
#include "DNA_lattice_types.h" #include "DNA_lattice_types.h"
#include "DNA_meta_types.h" #include "DNA_meta_types.h"
#include "DNA_mesh_types.h" #include "DNA_mesh_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_screen_types.h" #include "DNA_screen_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
@ -76,6 +77,7 @@
#include "BKE_ipo.h" #include "BKE_ipo.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h" #include "BKE_object.h"
#include "BKE_utildefines.h" #include "BKE_utildefines.h"
@ -493,17 +495,25 @@ static void count_object(Object *ob, int sel, int totob)
{ {
Mesh *me; Mesh *me;
Curve *cu; Curve *cu;
int tot=0, totf=0; int tot=0, totf=0, subsurf;
switch(ob->type) { switch(ob->type) {
case OB_MESH: case OB_MESH:
G.totmesh+=totob; G.totmesh+=totob;
me= get_mesh(ob); me= get_mesh(ob);
if(me) { if(me) {
ModifierData *md = modifiers_findByType(ob, eModifierType_Subsurf);
int totvert, totface; int totvert, totface;
totvert= me->totvert*totob; if (md) {
totface= me->totface*totob; SubsurfModifierData *smd = (SubsurfModifierData*) md;
subsurf= 1<<(2*smd->levels);
}
else subsurf= 1;
totvert= subsurf*me->totvert*totob;
totface= subsurf*me->totface*totob;
G.totvert+= totvert; G.totvert+= totvert;
G.totface+= totface; G.totface+= totface;

1
source/blender/src/editobject.c
View File

@ -2414,6 +2414,7 @@ void flip_subdivison(Object *ob, int level)
} }
} }
countall();
allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWVIEW3D, 0);
allqueue(REDRAWOOPS, 0); allqueue(REDRAWOOPS, 0);
allqueue(REDRAWBUTSEDIT, 0); allqueue(REDRAWBUTSEDIT, 0);