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.
This commit is contained in:
2006-11-29 21:59:19 +00:00
parent 5a3959e54b
commit e82f7818fc
4 changed files with 10 additions and 5 deletions

View File

@@ -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);