diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2019-08-19 20:25:29 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2019-09-13 18:37:35 +0300 |
| commit | 92736a7b75920ffe4b8016a2d097ff8e36687c70 (patch) | |
| tree | 33594ff97ce96124481ce9d898ea31158f91236c /source/blender/makesdna/DNA_layer_types.h | |
| parent | ce34a6b0d727bbde6ae373afa8ec6c42bc8980ce (diff) | |
Per-Viewport Collection Visibility
Support per-viewport collection visibility options.
Note 1: There is no way to show a collection that was not visible before
due to depsgraph. Otherwise we would risk having all the collections in
the depsgraph and I believe this is not the idea.
An alternative would be to have a new depsgraph for viewports that are
not local. Something to keep in mind if we do per-viewport current frame
in the future.
So for now what we do is to only allow collections visibility to be
disabled/hidden in this mode.
Note 2: hide_viewport (the eye icon) doesn't really matter for
depsgraph. So after the merge we can still ignore it to show the
collections locally in a viewport with no problems for the depsgraph.
Reviewers: brecht, sergey
Subscribers: billreynish
Related task: T61327
Differential Revision: https://developer.blender.org/D5611
Diffstat (limited to 'source/blender/makesdna/DNA_layer_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_layer_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h index 5f64e3220b7..3af1da46f80 100644 --- a/source/blender/makesdna/DNA_layer_types.h +++ b/source/blender/makesdna/DNA_layer_types.h @@ -45,6 +45,8 @@ typedef struct Base { struct Object *object; unsigned int lay DNA_DEPRECATED; int flag_legacy; + unsigned short local_collections_bits; + short _pad2[3]; /* Pointer to an original base. Is initialized for evaluated view layer. * NOTE: Only allowed to be accessed from within active dependency graph. */ @@ -66,8 +68,12 @@ typedef struct LayerCollection { short flag; short runtime_flag; char _pad[4]; + /** Synced with collection->children. */ ListBase layer_collections; + + unsigned short local_collections_bits; + short _pad2[3]; } LayerCollection; typedef struct ViewLayer { |