diff options
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_group_types.h | 7 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_layer_types.h | 8 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_group_types.h b/source/blender/makesdna/DNA_group_types.h index 45dd0cb9ff2..8f15aa85e97 100644 --- a/source/blender/makesdna/DNA_group_types.h +++ b/source/blender/makesdna/DNA_group_types.h @@ -60,6 +60,13 @@ typedef struct Group { * on the last used scene */ unsigned int layer; float dupli_ofs[3]; + + struct SceneCollection *collection; + struct ViewLayer *view_layer; } Group; + +#define GROUP_MASTER_COLLECTION(_group) \ + (((LayerCollection *)(_group)->view_layer->layer_collections.first)->scene_collection) + #endif /* __DNA_GROUP_TYPES_H__ */ diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h index 3eac7f0aab3..c677383cb6e 100644 --- a/source/blender/makesdna/DNA_layer_types.h +++ b/source/blender/makesdna/DNA_layer_types.h @@ -104,7 +104,8 @@ typedef struct SceneCollection { char name[64]; /* MAX_NAME */ char filter[64]; /* MAX_NAME */ int active_object_index; /* for UI */ - int pad; + char type; + char pad[3]; ListBase objects; /* (Object *)LinkData->data */ ListBase filter_objects; /* (Object *)LinkData->data */ ListBase scene_collections; /* nested collections */ @@ -134,6 +135,11 @@ enum { VIEW_LAYER_FREESTYLE = (1 << 2), }; +/* SceneCollection->type */ +enum { + COLLECTION_TYPE_NONE = 0, + COLLECTION_TYPE_GROUP_INTERNAL = 1, +}; /* *************************************************************** */ /* Engine Settings */ diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index a706ea50ebd..78c623f6408 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -371,6 +371,7 @@ typedef struct DupliObject { struct ParticleSystem *particle_system; unsigned int random_id; unsigned int pad; + struct IDProperty *collection_properties; } DupliObject; /* **************** OBJECT ********************* */ |