diff options
author | Falk David <falkdavid@gmx.de> | 2021-03-31 15:22:55 +0300 |
---|---|---|
committer | Falk David <falkdavid@gmx.de> | 2021-03-31 15:23:08 +0300 |
commit | d97dca510625169c469dc34a5d71720cf510f61f (patch) | |
tree | f4336c0877c6a6ca86759865165c2521556a00c8 | |
parent | 8d45a9678955694cdd44aa709b5175308821dbba (diff) |
Fix T86947: Drag & Drop tooltip in Scene mode
The tooltip while dragging a collection in Scene mode in the Outliner
was always "Link inside Collection" even if the action performed was
different. This was because the `collection_drop_init` set the
`from_collection` always to `NULL` if the Outliner display mode was
currently set to Scene.
Commit that introduced this issue:
rB0f54c3a9b75be8f8db9022fb0aeb0f8d0d4f0299
The fix removes the check of the display mode and only sets the
`from_collection` to `NULL` if the ctrl (linking) key is held.
Reviewed By: JacquesLucke
Maniphest Tasks: T86947
Differential Revision: https://developer.blender.org/D10864
-rw-r--r-- | source/blender/editors/space_outliner/outliner_dragdrop.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.c b/source/blender/editors/space_outliner/outliner_dragdrop.c index b3b36811411..83f71292232 100644 --- a/source/blender/editors/space_outliner/outliner_dragdrop.c +++ b/source/blender/editors/space_outliner/outliner_dragdrop.c @@ -1104,9 +1104,7 @@ static bool collection_drop_init(bContext *C, const wmEvent *event, CollectionDrop *data) { - SpaceOutliner *space_outliner = CTX_wm_space_outliner(C); - - /* Get collection to drop into. */ +/* Get collection to drop into. */ TreeElementInsertType insert_type; TreeElement *te = outliner_drop_insert_collection_find(C, event, &insert_type); if (!te) { @@ -1140,7 +1138,7 @@ static bool collection_drop_init(bContext *C, /* Get collection to drag out of. */ ID *parent = drag_id->from_parent; Collection *from_collection = collection_parent_from_ID(parent); - if (event->ctrl || space_outliner->outlinevis == SO_SCENES) { + if (event->ctrl) { from_collection = NULL; } |