diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-12-14 16:46:49 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-12-15 13:56:48 +0300 |
commit | 1f5106de610b115b87ab6121d7871d447ca48cd2 (patch) | |
tree | d929ef94556eac6063c24983cc6b89f52075701c /source/blender/editors/space_outliner/outliner_intern.h | |
parent | 7402b8ec74b4f74371d92816d22869ec9bd95da4 (diff) |
Group collection viewport/render options and remove collection visibility
Users can change the group collection visibility in the outliner
when looking at groups.
Regular collections on the other hand don't have any special visibility control,
if you need a collection to be invisible during render, either don't link it
into the view layer used for F12, or disable it.
This includes:
* Updated unittests - update your lib/tests/layers folder.
* Subversion bump - branches be aware of that.
Note:
Although we are using eval_ctx to determine the visibility of a group collection
when rendering, the depsgraph is still using the same depsgraph for the viewport
and the render engine, so at the moment the render visibility is ignored.
Following next is a workaround for this separately to tag the groups before and
after rendering to tackle that.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_intern.h')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 9047512caad..abf733d0684 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -143,12 +143,14 @@ typedef enum { /* size constants */ #define OL_Y_OFFSET 2 -#define OL_TOG_RESTRICT_ENABLEX (UI_UNIT_X * 3.0f) +#define OL_TOG_RESTRICT_ENABLEX UI_UNIT_X #define OL_TOG_RESTRICT_VIEWX (UI_UNIT_X * 2.0f) -#define OL_TOG_RESTRICT_SELECTX UI_UNIT_X -#define OL_TOG_RESTRICT_RENDERX UI_UNIT_X +#define OL_TOG_RESTRICT_SELECTX (UI_UNIT_X * 2.0f) +#define OL_TOG_RESTRICT_RENDERX (UI_UNIT_X * 2.0f) +#define OL_TOG_RESTRICT_VIEWPORTX (UI_UNIT_X * 3.0f) -#define OL_TOGW OL_TOG_RESTRICT_ENABLEX +#define OL_TOGW OL_TOG_RESTRICT_VIEWX +#define OL_TOG_GROUPW OL_TOG_RESTRICT_VIEWPORTX #define OL_RNA_COLX (UI_UNIT_X * 15) #define OL_RNA_COL_SIZEX (UI_UNIT_X * 7.5f) |