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>2018-01-19 17:46:23 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-01-19 17:46:23 +0300
commitd9858d5897efbf0e41ebe61c2aaabf451c33d6ad (patch)
tree96661f5f7e5309ea6d5e9a803af77112ed039d89 /release
parent7866870a9a58ce086f4af5dc7dc7bc8acf1e333c (diff)
parentedf053ff635e782d09b64d205fadfca3cce79de4 (diff)
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_outliner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 5b4a7d34264..eb259eece66 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -138,7 +138,7 @@ class OUTLINER_MT_view(Menu):
space = context.space_data
- if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'}:
+ if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES'}:
layout.prop(space, "use_sort_alpha")
layout.prop(space, "show_restrict_columns")
layout.separator()