diff options
Diffstat (limited to 'source/blender/editors/space_info/info_stats.c')
| -rw-r--r-- | source/blender/editors/space_info/info_stats.c | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index 6e156750815..8dc6c4229b2 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -35,7 +35,6 @@ #include "DNA_group_types.h" #include "DNA_lattice_types.h" #include "DNA_meta_types.h" -#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "BLI_math.h" @@ -51,6 +50,7 @@ #include "BKE_DerivedMesh.h" #include "BKE_key.h" #include "BKE_paint.h" +#include "BKE_particle.h" #include "BKE_editmesh.h" #include "ED_info.h" @@ -273,7 +273,37 @@ static void stats_dupli_object(Base *base, Object *ob, SceneStats *stats) { if (base->flag & SELECT) stats->totobjsel++; - if (ob->parent && (ob->parent->transflag & (OB_DUPLIVERTS | OB_DUPLIFACES))) { + if (ob->transflag & OB_DUPLIPARTS) { + /* Dupli Particles */ + ParticleSystem *psys; + ParticleSettings *part; + + for (psys = ob->particlesystem.first; psys; psys = psys->next) { + part = psys->part; + + if (part->draw_as == PART_DRAW_OB && part->dup_ob) { + int tot = count_particles(psys); + stats_object(part->dup_ob, 0, tot, stats); + } + else if (part->draw_as == PART_DRAW_GR && part->dup_group) { + GroupObject *go; + int tot, totgroup = 0, cur = 0; + + for (go = part->dup_group->gobject.first; go; go = go->next) + totgroup++; + + for (go = part->dup_group->gobject.first; go; go = go->next) { + tot = count_particles_mod(psys, totgroup, cur); + stats_object(go->ob, 0, tot, stats); + cur++; + } + } + } + + stats_object(ob, base->flag & SELECT, 1, stats); + stats->totobj++; + } + else if (ob->parent && (ob->parent->transflag & (OB_DUPLIVERTS | OB_DUPLIFACES))) { /* Dupli Verts/Faces */ int tot; |