diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-02-13 02:25:30 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-02-13 02:25:30 +0300 |
| commit | 8a92277a317459a591a7898c5d7927584d1c9718 (patch) | |
| tree | 8f0b84f2404ecd0c8ef33f7d534900b3e6105bd1 /source/blender/makesdna | |
| parent | adf355849f5c68bf504ba435cc54872b2e2ee87a (diff) | |
Layers: Per-Collection edit mode parsing
Note: we are now merging all the collection engines (mode and render), which eventually may get slow. But as stated before, this is to expose the functionality, while waiting for proper depsgraph integrated solution.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index b92d2cd1573..fb0a02e92ae 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -304,7 +304,7 @@ typedef struct Object { struct PreviewImage *preview; - struct CollectionEngineSettings *collection_settings; /* used by depsgraph, flushed from collection-tree */ + ListBase collection_settings; /* used by depsgraph, flushed from collection-tree */ } Object; /* Warning, this is not used anymore because hooks are now modifiers */ |