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:
authorJulian Eisel <eiseljulian@gmail.com>2017-03-10 23:01:10 +0300
committerJulian Eisel <eiseljulian@gmail.com>2017-03-10 23:01:10 +0300
commitfcd3bf527510b7826b5e8bc79cdae199db6d51c7 (patch)
tree2aaffe1368b307d7bf38b810dbb274b70f0035f1 /source/blender/editors/space_outliner/outliner_tree.c
parent0d7dfd9f4683f43124d04fc07d5cbf54e89c5b4b (diff)
Insert into master collection when dragging above it
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tree.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 6c1b3e55170..49a3759fcb0 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1394,7 +1394,8 @@ static bool outliner_scene_collections_reorder_poll(
/* exception: Can't insert before/after master selection, has to be one of its childs */
TreeElement *te_master = *io_insert_handle;
if (*io_action == TE_INSERT_BEFORE) {
- *io_insert_handle = te_master->subtree.first;
+ /* can't go higher than master collection, insert into it */
+ *io_action = TE_INSERT_INTO;
}
else if (*io_action == TE_INSERT_AFTER) {
*io_insert_handle = te_master->subtree.last;