[Bf-blender-cvs] [aff8ce438a] blender2.8: Outliner: Don't use alphabetical sorting for collections

[Julian Eisel]

Commit: aff8ce438a1f856f44e92319063950d7fc500c24
Author: Julian Eisel
Date:   Sun Feb 26 22:32:43 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBaff8ce438a1f856f44e92319063950d7fc500c24

Outliner: Don't use alphabetical sorting for collections

Order of collections matters, so sorting the outliner entries to be
alphabetical is misleading.

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

M	release/scripts/startup/bl_ui/space_outliner.py
M	source/blender/editors/space_outliner/outliner_ops.c

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

diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 56b6ea4622..a267dab0a4 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -97,7 +97,8 @@ class OUTLINER_MT_view(Menu):
         space = context.space_data
 
         if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'}:
-            layout.prop(space, "use_sort_alpha")
+            if space.display_mode != 'COLLECTIONS':
+                layout.prop(space, "use_sort_alpha")
             layout.prop(space, "show_restrict_columns")
             layout.separator()
             layout.operator("outliner.show_active")
diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c
index d94ccde57e..d63eab5e07 100644
--- a/source/blender/editors/space_outliner/outliner_ops.c
+++ b/source/blender/editors/space_outliner/outliner_ops.c
@@ -61,9 +61,8 @@ static int outliner_item_drag_drop_poll(bContext *C)
 {
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 	return ED_operator_outliner_active(C) &&
-	        (soops->flag & SO_SKIP_SORT_ALPHA) &&
-	        /* Only collection display mode supported for now. Others need more design work */
-	        ELEM(soops->outlinevis, SO_COLLECTIONS);
+	       /* Only collection display mode supported for now. Others need more design work */
+	       ELEM(soops->outlinevis, SO_COLLECTIONS);
 }
 
 static TreeElement *outliner_item_drag_element_find(SpaceOops *soops, ARegion *ar, const wmEvent *event)