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:
authorLukas Tönne <lukas.toenne@gmail.com>2016-04-12 14:04:31 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2016-04-12 14:04:31 +0300
commit29a792a75b66e0222fb29694b9f33c2f70bbcaa6 (patch)
tree2392e61ea795df1a38ec678f6bd841ee82502d62 /source/blender/editors/space_info
parentcc468c1974e35674f7d70c153cd7b20fc249aa8d (diff)
Removed all direct uses of BKE_particle.h and DNA_particle_types.h from source/blender/editors.
Diffstat (limited to 'source/blender/editors/space_info')
-rw-r--r--source/blender/editors/space_info/info_stats.c34
1 files changed, 2 insertions, 32 deletions
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c
index dafb71b4480..fe66750a9ec 100644
--- a/source/blender/editors/space_info/info_stats.c
+++ b/source/blender/editors/space_info/info_stats.c
@@ -35,6 +35,7 @@
#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"
@@ -50,7 +51,6 @@
#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,37 +273,7 @@ static void stats_dupli_object(Base *base, Object *ob, SceneStats *stats)
{
if (base->flag & SELECT) stats->totobjsel++;
- 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))) {
+ if (ob->parent && (ob->parent->transflag & (OB_DUPLIVERTS | OB_DUPLIFACES))) {
/* Dupli Verts/Faces */
int tot;