diff options
author | Ton Roosendaal <ton@blender.org> | 2005-05-02 16:16:18 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-05-02 16:16:18 +0400 |
commit | 2606a5c5d37e6460066dae78e88d47fde6552c65 (patch) | |
tree | b7a1ca6a71919526760c919107c54ff6695bbfb5 /source/blender/src/edit.c | |
parent | 61f2736ec36154f5832c11ae5d018e6eaf89a3b2 (diff) |
Removed DerivedMesh and DispList creation from countall().
Apart from the not very structured way countall() is called, it should not
make displists then, since the order of calculations then get spoiled.
Diffstat (limited to 'source/blender/src/edit.c')
-rw-r--r-- | source/blender/src/edit.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c index 56259556a4a..2c7443c9298 100644 --- a/source/blender/src/edit.c +++ b/source/blender/src/edit.c @@ -66,7 +66,6 @@ #include "BKE_anim.h" #include "BKE_object.h" #include "BKE_displist.h" -#include "BKE_DerivedMesh.h" #include "BKE_global.h" #include "BKE_lattice.h" #include "BKE_mesh.h" @@ -493,12 +492,12 @@ void count_object(Object *ob, int sel) G.totmesh++; me= get_mesh(ob); if(me) { - DerivedMesh *dm = mesh_get_derived(ob); int totvert, totface; - - if (dm) { - totvert= dm->getNumVerts(dm); - totface= dm->getNumFaces(dm); + + /* note; do not make disp or get derived mesh here. spoils dependency order */ + if (me->flag & ME_SUBSURF) { + totvert= me->totvert<<me->subdiv; + totface= me->totface<<me->subdiv; } else { totvert= me->totvert; totface= me->totface; |