[Bf-blender-cvs] [60eb897fa5f] blender2.8: Outliner: Alphabetical sorting - Fixup on "Get rid of Search Menu"

Dalai Felinto noreply at git.blender.org
Thu Jan 18 21:16:31 CET 2018


Commit: 60eb897fa5f8d3683211d5416178b99231ef9166
Author: Dalai Felinto
Date:   Thu Jan 18 18:14:10 2018 -0200
Branches: blender2.8
https://developer.blender.org/rB60eb897fa5f8d3683211d5416178b99231ef9166

Outliner: Alphabetical sorting - Fixup on "Get rid of Search Menu"

Issue introduced on 51bcf7bd5f3f2.

Alphabetical sorting is not related to search, so it shouldn't have been
touched by the Search Menu changes.

===================================================================

M	release/scripts/startup/bl_ui/space_outliner.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 8696345c8c0..60684911eb3 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -43,10 +43,7 @@ class OUTLINER_HT_header(Header):
         row.prop(space, "use_filter_complete", text="")
         row.prop(space, "use_filter_case_sensitive", text="")
 
-        if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS', 'VIEW_LAYER', 'COLLECTIONS'}:
-            row.prop(space, "use_sort_alpha", text="")
-
-        elif space.display_mode == 'DATABLOCKS':
+        if space.display_mode == 'DATABLOCKS':
             layout.separator()
             row = layout.row(align=True)
             row.operator("outliner.keyingset_add_selected", icon='ZOOMIN', text="")
@@ -96,6 +93,9 @@ 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 {'VIEW_LAYER', 'COLLECTIONS'}:
+                layout.prop(space, "use_sort_alpha")
+
             layout.prop(space, "show_restrict_columns")
             layout.separator()
             layout.operator("outliner.show_active")



More information about the Bf-blender-cvs mailing list