Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2019-05-15 14:14:00 +0300
committerDalai Felinto <dfelinto@gmail.com>2019-05-15 14:18:15 +0300
commit5c8df0a742cce10fcddc4dab9472b9ba1553c676 (patch)
tree7b020c5011b27d23a30714123a8febdd7e1de8c6 /source/blender/editors/space_outliner/outliner_utils.c
parent4965af1b7aa60466f6f8842a6f77a0d9b2cb72ac (diff)
Fix default open outliner restrict columns
Regression introduced on 777a546c0c7.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_utils.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_utils.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c
index 9f99c658bd9..f57dce97b38 100644
--- a/source/blender/editors/space_outliner/outliner_utils.c
+++ b/source/blender/editors/space_outliner/outliner_utils.c
@@ -270,6 +270,7 @@ float outliner_restrict_columns_width(const SpaceOutliner *soops)
switch (soops->outlinevis) {
case SO_DATA_API:
case SO_SEQUENCE:
+ case SO_LIBRARIES:
return 0.0f;
case SO_ID_ORPHANS:
num_columns = 3;
@@ -286,18 +287,16 @@ float outliner_restrict_columns_width(const SpaceOutliner *soops)
if (soops->show_restrict_flags & SO_RESTRICT_SELECT) {
num_columns++;
}
- if (soops->show_restrict_flags & SO_RESTRICT_VIEWPORT) {
+ if (soops->show_restrict_flags & SO_RESTRICT_HIDE) {
num_columns++;
}
- if (soops->show_restrict_flags & SO_RESTRICT_HIDE) {
+ if (soops->show_restrict_flags & SO_RESTRICT_VIEWPORT) {
num_columns++;
}
if (soops->show_restrict_flags & SO_RESTRICT_RENDER) {
num_columns++;
}
break;
- case SO_LIBRARIES:
- return 0.0f;
}
return (num_columns * UI_UNIT_X + V2D_SCROLL_WIDTH);
}