[Bf-blender-cvs] [fcd3bf52751] blender2.8: Insert into master collection when dragging above it

Julian Eisel noreply at git.blender.org
Fri Mar 10 21:07:03 CET 2017


Commit: fcd3bf527510b7826b5e8bc79cdae199db6d51c7
Author: Julian Eisel
Date:   Fri Mar 10 21:01:10 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBfcd3bf527510b7826b5e8bc79cdae199db6d51c7

Insert into master collection when dragging above it

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

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

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

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;




More information about the Bf-blender-cvs mailing list