[Bf-blender-cvs] [6140d22af3c] soc-2020-outliner: Outliner: Disable collection reorder when sorted

[Nathan Craddock]

Commit: 6140d22af3c097e67b1e574fbf6fc90e37794312
Author: Nathan Craddock
Date:   Tue Jul 7 11:17:26 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB6140d22af3c097e67b1e574fbf6fc90e37794312

Outliner: Disable collection reorder when sorted

Disable reordering collections in the outliner when not in manual sort
mode.

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

M	source/blender/editors/space_outliner/outliner_dragdrop.c

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

diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.c b/source/blender/editors/space_outliner/outliner_dragdrop.c
index a2b1c7a28d8..dc6e4571944 100644
--- a/source/blender/editors/space_outliner/outliner_dragdrop.c
+++ b/source/blender/editors/space_outliner/outliner_dragdrop.c
@@ -239,6 +239,11 @@ static TreeElement *outliner_drop_insert_collection_find(bContext *C,
     return NULL;
   }
 
+  SpaceOutliner *soutliner = CTX_wm_space_outliner(C);
+  if (soutliner->sort_method != SO_SORT_FREE) {
+    *r_insert_type = TE_INSERT_INTO;
+  }
+
   if (collection_te != te) {
     *r_insert_type = TE_INSERT_INTO;
   }