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_scene_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_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 3334b1eafe8..ca572f1ddf1 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1979,6 +1979,8 @@ extern const char *RE_engine_id_CYCLES; #define BASE_VISIBLE(v3d, base) \ (((v3d == NULL) || ((v3d)->localvd == NULL) || \ ((v3d)->local_view_uuid & (base)->local_view_bits)) && \ + ((v3d == NULL) || (((v3d)->flag & V3D_LOCAL_COLLECTIONS) == 0) || \ + ((v3d)->local_collections_uuid & (base)->local_collections_bits)) && \ ((v3d == NULL) || \ (((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0)) && \ (((base)->flag & BASE_VISIBLE) != 0)) |