diff options
| author | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
|---|---|---|
| committer | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
| commit | 97a4a8d0fb7fd9ac34f9f5d4d5a0689c01235e14 (patch) | |
| tree | fc9746d2210eda08be9d44ae67d5e58d64b48b40 /intern/cycles/blender/blender_id_map.h | |
| parent | 4a7c203e9ecc7c5b0370afc0fdd6bcc183dc00df (diff) | |
| parent | f3e8326453ae856d7914e45e832a2ed80aa9a9b9 (diff) | |
merge
Diffstat (limited to 'intern/cycles/blender/blender_id_map.h')
| -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; |