blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix incorrect positioning of collection when dropping it after expanded one

This commit is contained in:
Julian Eisel 2017-03-10 15:56:41 +01:00
parent 8e303aae25
commit 08cde7c785
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/space_outliner/outliner_ops.c
View File

@ -30,6 +30,7 @@
#include "BKE_context.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
#include "ED_screen.h"
@ -91,7 +92,19 @@ static void outliner_item_drag_handle(
te_dragged->drag_data->insert_handle = insert_handle;
if (view_mval[1] < (insert_handle->ys + margin)) {
te_dragged->drag_data->insert_type = TE_INSERT_AFTER;
if (TSELEM_OPEN(tselem_handle, soops)) {
/* inserting after a open item means we insert into it, but as first child */
if (BLI_listbase_is_empty(&insert_handle->subtree)) {
te_dragged->drag_data->insert_type = TE_INSERT_INTO;
}
else {
te_dragged->drag_data->insert_type = TE_INSERT_BEFORE;
te_dragged->drag_data->insert_handle = insert_handle->subtree.first;
}
}
else {
te_dragged->drag_data->insert_type = TE_INSERT_AFTER;
}
}
else if (view_mval[1] > (insert_handle->ys + (2 * margin))) {
te_dragged->drag_data->insert_type = TE_INSERT_BEFORE;