diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-05-15 14:47:04 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-05-15 14:47:04 +0300 |
| commit | 03659c2cf9b38eef65b7d1dcd4263ef8a5602bde (patch) | |
| tree | 05f06a22dbf7c2beeb0dca35f9a865f11904416a /source/blender/editors/space_outliner | |
| parent | a5d394fad23280687880aee0082797cf8dd1cdd5 (diff) | |
| parent | 0a32f6c8686c6a14a052f5b254655b3b69a581e3 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_dragdrop.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.c b/source/blender/editors/space_outliner/outliner_dragdrop.c index 44e5347dcad..c2c9f3a5bfb 100644 --- a/source/blender/editors/space_outliner/outliner_dragdrop.c +++ b/source/blender/editors/space_outliner/outliner_dragdrop.c @@ -675,6 +675,10 @@ static bool collection_drop_init(bContext *C, if (ID_IS_LINKED(to_collection)) { return false; } + /* Currently this should not be allowed (might be supported in the future though...). */ + if (ID_IS_OVERRIDE_LIBRARY(to_collection)) { + return false; + } /* Get drag datablocks. */ if (drag->type != WM_DRAG_ID) { |