diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-12 18:40:18 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-26 16:13:37 +0300 |
| commit | 4fd394369627e95d269d6cd4a87b03a07bd78987 (patch) | |
| tree | 77a593fea187ae970955cbaeca66fb51052e7c31 /source/blender/makesdna/DNA_object_types.h | |
| parent | 607e0f0d526fbb0f09d8c74aa24f9e268e54cfc3 (diff) | |
Store object pointers for the dupli objects we generate from caches.
This is necessary for the current viewport drawing and rendering code,
which expected each dupli instance to represent a copy of data in the
DNA.
The code maps base-level objects in the cache to DNA Objects inside the
dupligroup by name. Only objects that can be found in the blend data
will be allowed for DupliObjects.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 507da3e2027..6bfba0ab0fe 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -336,6 +336,11 @@ typedef struct DupliObject { /* data that can be shared by multiple DupliObject instances */ typedef struct DupliObjectData { + /* XXX eventually it should be possible to construct dupli instances + * entirely without Objects in the DNA, but current drawing code and + * others make this too difficult + */ + struct Object *ob; struct DerivedMesh *cache_dm; } DupliObjectData; |