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:
authorDalai Felinto <dfelinto@gmail.com>2018-01-25 17:42:20 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-01-26 00:26:11 +0300
commit5b67f7a959e4f01c95ed3576a3b4683bd63f67e8 (patch)
treed28621c1efe5349a673a938efe0ae6bbe13aa425 /source/blender/editors/space_outliner/outliner_ops.c
parent7e885e1e1044269659242044bb2c947b4b30ec66 (diff)
Outliner: Implement Add (Ctrl) when moving objects inside collection
Note there is no "text" explaining to users what is going on. I will address this shortly in an upcoming commit.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_ops.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_ops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c
index 3dc6beec2b0..5f73f176e2e 100644
--- a/source/blender/editors/space_outliner/outliner_ops.c
+++ b/source/blender/editors/space_outliner/outliner_ops.c
@@ -164,7 +164,7 @@ static void outliner_item_drag_handle(
te_dragged->drag_data->insert_handle = te_insert_handle;
}
-static bool outliner_item_drag_drop_apply(Main *bmain, SpaceOops *soops, TreeElement *dragged_te)
+static bool outliner_item_drag_drop_apply(Main *bmain, SpaceOops *soops, TreeElement *dragged_te, const wmEvent *event)
{
TreeElement *insert_handle = dragged_te->drag_data->insert_handle;
TreeElementInsertType insert_type = dragged_te->drag_data->insert_type;
@@ -178,7 +178,7 @@ static bool outliner_item_drag_drop_apply(Main *bmain, SpaceOops *soops, TreeEle
/* call of assert above should not have changed insert_handle and insert_type at this point */
BLI_assert(dragged_te->drag_data->insert_handle == insert_handle &&
dragged_te->drag_data->insert_type == insert_type);
- dragged_te->reinsert(bmain, soops, dragged_te, insert_handle, insert_type);
+ dragged_te->reinsert(bmain, soops, dragged_te, insert_handle, insert_type, event);
return true;
}
@@ -198,7 +198,7 @@ static int outliner_item_drag_drop_modal(bContext *C, wmOperator *op, const wmEv
switch (event->type) {
case EVT_MODAL_MAP:
if (event->val == OUTLINER_ITEM_DRAG_CONFIRM) {
- if (outliner_item_drag_drop_apply(bmain, soops, te_dragged)) {
+ if (outliner_item_drag_drop_apply(bmain, soops, te_dragged, event)) {
skip_rebuild = false;
}
retval = OPERATOR_FINISHED;