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:
authorJacques Lucke <mail@jlucke.com>2018-10-18 16:45:48 +0300
committerJacques Lucke <mail@jlucke.com>2018-10-18 16:45:48 +0300
commitce0a468408cd7e639785b77363f090f91af6f2f6 (patch)
tree394d1b20f425c99754f9a598999a7b6213dff88a /source/blender/editors/space_outliner/outliner_dragdrop.c
parent41216d5ad4c722e2ad9f15c968af454fc7566d5e (diff)
Outliner: drop into master collection when below everything else
Reviewers: brecht Differential Revision: https://developer.blender.org/D3810
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_dragdrop.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_dragdrop.c14
1 files changed, 2 insertions, 12 deletions
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;