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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-02-12 21:17:14 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-02-12 21:18:32 +0300
commit9d63b0d539b4fcec4ac41a84631e86684b7334b0 (patch)
tree6ba6ee601c8780edf4f1caac7a11f9cf4ddef0e6 /source/blender/blenkernel
parentc8e446e1ca766cf54490a2810242f5b401f5b87f (diff)
Fix T61469: wrong object statistics when using instances.
The new code already loops over all instances, don't need to be counted again.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_anim.h1
-rw-r--r--source/blender/blenkernel/intern/object_dupli.c25
2 files changed, 0 insertions, 26 deletions
diff --git a/source/blender/blenkernel/BKE_anim.h b/source/blender/blenkernel/BKE_anim.h
index 125e40ea7fa..dccb8eb01f3 100644
--- a/source/blender/blenkernel/BKE_anim.h
+++ b/source/blender/blenkernel/BKE_anim.h
@@ -65,7 +65,6 @@ int where_on_path(struct Object *ob, float ctime, float vec[4], float dir[3], fl
struct ListBase *object_duplilist(struct Depsgraph *depsgraph, struct Scene *sce, struct Object *ob);
void free_object_duplilist(struct ListBase *lb);
-int count_duplilist(struct Object *ob);
typedef struct DupliObject {
struct DupliObject *next, *prev;
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 4c10e5af89e..22402a6a206 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -1102,28 +1102,3 @@ void free_object_duplilist(ListBase *lb)
BLI_freelistN(lb);
MEM_freeN(lb);
}
-
-int count_duplilist(Object *ob)
-{
- if (ob->transflag & OB_DUPLI) {
- if (ob->transflag & OB_DUPLIVERTS) {
- if (ob->type == OB_MESH) {
- if (ob->transflag & OB_DUPLIVERTS) {
- ParticleSystem *psys = ob->particlesystem.first;
- int pdup = 0;
-
- for (; psys; psys = psys->next)
- pdup += psys->totpart;
-
- if (pdup == 0) {
- Mesh *me = ob->data;
- return me->totvert;
- }
- else
- return pdup;
- }
- }
- }
- }
- return 1;
-}