Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-12-09 17:23:53 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-12-09 17:23:53 +0400
commit8b53717c7875cd4aed5d9985d9f1fa3c416c75e2 (patch)
tree51e0ebbf4407348952c86f6c67b79c86bc451302 /source/blender/editors/space_info
parent2ef3f6159ca2ead6b8c0fbc3d83d8eb42f2f5974 (diff)
Fix T37750: Incorrect stats for dupli-metaballs
Diffstat (limited to 'source/blender/editors/space_info')
-rw-r--r--source/blender/editors/space_info/info_stats.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c
index 9686c6dfc29..4babda08898 100644
--- a/source/blender/editors/space_info/info_stats.c
+++ b/source/blender/editors/space_info/info_stats.c
@@ -296,7 +296,16 @@ static void stats_dupli_object(Base *base, Object *ob, SceneStats *stats)
}
else if (ob->parent && (ob->parent->transflag & (OB_DUPLIVERTS | OB_DUPLIFACES))) {
/* Dupli Verts/Faces */
- int tot = count_duplilist(ob->parent);
+ int tot;
+
+ /* metaball dupli-instances are tessellated once */
+ if (ob->type == OB_MBALL) {
+ tot = 1;
+ }
+ else {
+ tot = count_duplilist(ob->parent);
+ }
+
stats->totobj += tot;
stats_object(ob, base->flag & SELECT, tot, stats);
}