From c5e01edecae5e0b07bd91772fa40e18cb5afdf4f Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 3 Jan 2018 18:32:46 -0200 Subject: Outliner: Fix for restriction columns This is a partial revert of 1f5106de610b115b87. First and firemost, for groups I was checking the wrong flag (soops->flag & SO_GROUPS) instead of (soops->outlinevis == SO_GROUPS). Second, the columns were entirely broken for things like Orphan Data. Third, I tried to have different columns for different `outlinevis`, but we have bones with only visible and select, modifiers with visible and render, render passes with enable and another value ... I would rather stay away from this mess at the moment, and stick to the more obvious bug fix. Finally, there is a bug (not addressed here) where the whole line is selected, regardless of the restriction column area. It should be fixed separately. --- source/blender/editors/space_outliner/outliner_intern.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/space_outliner/outliner_intern.h') diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index fc924ecdfba..f5687456663 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -143,14 +143,11 @@ typedef enum { /* size constants */ #define OL_Y_OFFSET 2 -#define OL_TOG_RESTRICT_ENABLEX UI_UNIT_X -#define OL_TOG_RESTRICT_VIEWX (UI_UNIT_X * 2.0f) +#define OL_TOG_RESTRICT_VIEWX (UI_UNIT_X * 3.0f) #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_TOG_RESTRICT_RENDERX UI_UNIT_X #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) -- cgit v1.2.3