diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-07-06 17:52:28 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-07-06 17:52:28 +0300 |
commit | bfc644dcfb52b873ad7c356cf4b05208fba17bba (patch) | |
tree | c2aa0f052e1382e248515bced0383d72906c34d8 /source/blender/blenkernel | |
parent | 0b07f9b71738c59b3834e2fc8b19779c72b3b020 (diff) |
Reduce `DupliObject::persistent_id` from 16 to 8 items
For historical reasons, `DupliObject::persistent_id` was of size
`2*MAX_DUPLI_RECUR`. These reasons are now gone, and the persistent ID
always gets exactly one array element for every dupli-recursion.
Differential Revision: https://developer.blender.org/D8222
Reviewed by: brecht
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_duplilist.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_duplilist.h b/source/blender/blenkernel/BKE_duplilist.h index 71b6d06b450..13918dd4fb1 100644 --- a/source/blender/blenkernel/BKE_duplilist.h +++ b/source/blender/blenkernel/BKE_duplilist.h @@ -52,7 +52,7 @@ typedef struct DupliObject { /* Persistent identifier for a dupli object, for inter-frame matching of * objects with motion blur, or inter-update matching for syncing. */ - int persistent_id[16]; /* 2*MAX_DUPLI_RECUR */ + int persistent_id[8]; /* MAX_DUPLI_RECUR */ /* Particle this dupli was generated from. */ struct ParticleSystem *particle_system; diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 4c6354f12a1..f498e147110 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -186,7 +186,7 @@ static DupliObject *make_dupli(const DupliContext *ctx, Object *ob, float mat[4] dob->random_id = BLI_hash_string(dob->ob->id.name + 2); if (dob->persistent_id[0] != INT_MAX) { - for (i = 0; i < MAX_DUPLI_RECUR * 2; i++) { + for (i = 0; i < MAX_DUPLI_RECUR; i++) { dob->random_id = BLI_hash_int_2d(dob->random_id, (unsigned int)dob->persistent_id[i]); } } |