diff options
author | Ton Roosendaal <ton@blender.org> | 2006-11-30 00:59:19 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-11-30 00:59:19 +0300 |
commit | e82f7818fcda9e26852c85bf93ebed7789915ce2 (patch) | |
tree | 0d3a2e893b72a9ec6084da370a0d4031e7134ba7 /source/blender/src/edit.c | |
parent | 5a3959e54b7a08ee852e5e65d46fe6ea2e37d342 (diff) |
Two-in-one commit:
- Proxy Armature: armature layer (visible bones) is now saved in proxy, so
on file reload the layer settings are restored
- bugreport: disabling subsurf (for view) didn't change the total amounts
in header.
Diffstat (limited to 'source/blender/src/edit.c')
-rw-r--r-- | source/blender/src/edit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c index 576b9c665d4..b915e1b6627 100644 --- a/source/blender/src/edit.c +++ b/source/blender/src/edit.c @@ -519,12 +519,12 @@ static void count_object(Object *ob, int sel, int totob) ModifierData *md = modifiers_findByType(ob, eModifierType_Subsurf); int totvert, totface; + subsurf= 1; if (md) { SubsurfModifierData *smd = (SubsurfModifierData*) md; - - subsurf= 1<<(2*smd->levels); + if(smd->modifier.mode & eModifierMode_Realtime) + subsurf= 1<<(2*smd->levels); } - else subsurf= 1; totvert= subsurf*me->totvert*totob; totface= subsurf*me->totface*totob; @@ -731,7 +731,7 @@ void countall() if(base->flag & SELECT) G.totobjsel++; - if(ob->parent && (ob->parent->transflag & OB_DUPLIVERTS)) { + if(ob->parent && (ob->parent->transflag & (OB_DUPLIVERTS|OB_DUPLIFACES))) { int tot= count_duplilist(ob->parent); G.totobj+=tot; count_object(ob, base->flag & SELECT, tot); |