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 /intern | |
| 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 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_id_map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_id_map.h b/intern/cycles/blender/blender_id_map.h index 3bc42e349ae..b5f6aaa67a8 100644 --- a/intern/cycles/blender/blender_id_map.h +++ b/intern/cycles/blender/blender_id_map.h @@ -200,7 +200,7 @@ template<typename K, typename T> class id_map { * To uniquely identify instances, we use the parent, object and persistent instance ID. * We also export separate object for a mesh and its particle hair. */ -enum { OBJECT_PERSISTENT_ID_SIZE = 16 }; +enum { OBJECT_PERSISTENT_ID_SIZE = 8 /* MAX_DUPLI_RECUR in Blender. */ }; struct ObjectKey { void *parent; |