From 777a546c0c789648f0f75315333d99e58050cd09 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 14 May 2019 17:45:47 -0300 Subject: Outliner Restriction: Naming sanitization and icon No major API change here, only in the outliner restriction column variables (e.g., show_restrict_column_selectable > show_restrict_column_select). * Get rid of _INSTANCE (introduced on b1af68200159). * Differentiate (everywhere but the API) between HIDE (temporary) and VIEWPORT (global). * Use the expected icon for restrict viewport (same as objects and modifiers). * selectable > select --- source/blender/editors/space_outliner/outliner_utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_outliner/outliner_utils.c') diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c index 4d3272eab20..9f99c658bd9 100644 --- a/source/blender/editors/space_outliner/outliner_utils.c +++ b/source/blender/editors/space_outliner/outliner_utils.c @@ -283,13 +283,13 @@ float outliner_restrict_columns_width(const SpaceOutliner *soops) } ATTR_FALLTHROUGH; case SO_SCENES: - if (soops->show_restrict_flags & SO_RESTRICT_SELECTABLE) { + if (soops->show_restrict_flags & SO_RESTRICT_SELECT) { num_columns++; } if (soops->show_restrict_flags & SO_RESTRICT_VIEWPORT) { num_columns++; } - if (soops->show_restrict_flags & SO_RESTRICT_INSTANCE) { + if (soops->show_restrict_flags & SO_RESTRICT_HIDE) { num_columns++; } if (soops->show_restrict_flags & SO_RESTRICT_RENDER) { -- cgit v1.2.3