[Bf-blender-cvs] [ce0a468408c] blender2.8: Outliner: drop into master collection when below everything else

Jacques Lucke noreply at git.blender.org
Thu Oct 18 15:46:31 CEST 2018


Commit: ce0a468408cd7e639785b77363f090f91af6f2f6
Author: Jacques Lucke
Date:   Thu Oct 18 15:45:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBce0a468408cd7e639785b77363f090f91af6f2f6

Outliner: drop into master collection when below everything else

Reviewers: brecht

Differential Revision: https://developer.blender.org/D3810

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

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 87f42aa75d2..978a2cc4af4 100644
--- a/source/blender/editors/space_outliner/outliner_dragdrop.c
+++ b/source/blender/editors/space_outliner/outliner_dragdrop.c
@@ -206,19 +206,9 @@ static TreeElement *outliner_drop_insert_collection_find(
 		return NULL;
 	}
 
-	/* We can't insert/before after master collection. */
+	/* We can't insert before/after master collection. */
 	if (collection->flag & COLLECTION_IS_MASTER) {
-		if (*r_insert_type == TE_INSERT_BEFORE) {
-			/* can't go higher than master collection, insert into it */
-			*r_insert_type = TE_INSERT_INTO;
-		}
-		else if (*r_insert_type == TE_INSERT_AFTER) {
-			te = te->subtree.last;
-			collection = outliner_collection_from_tree_element(te);
-			if (!collection) {
-				return NULL;
-			}
-		}
+		*r_insert_type = TE_INSERT_INTO;
 	}
 
 	return te;



More information about the Bf-blender-cvs mailing list