diff options
| author | Nathan Craddock <nzcraddock@gmail.com> | 2020-07-30 20:24:39 +0300 |
|---|---|---|
| committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-07-30 20:24:39 +0300 |
| commit | 9132fd882533991ab78beb4289efdf6b1da5178b (patch) | |
| tree | 01108d8f39bf9f167df57a5fd6b63baba80393a8 | |
| parent | 820ca419e098f1ac90b499180a3206dd44692ba8 (diff) | |
| parent | f45f8a7a898575819a8c687ed6935ee94ddefa8e (diff) | |
Merge branch 'blender-v2.90-release' into master
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 09dc1320c3a..db42fb8f319 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -2192,7 +2192,9 @@ static bool outliner_element_is_collection_or_object(TreeElement *te) if ((tselem->type == 0) && (te->idcode == ID_OB)) { return true; } - if (outliner_is_collection_tree_element(te)) { + + /* Collection instance datablocks should not be extracted. */ + if (outliner_is_collection_tree_element(te) && !(te->parent && te->parent->idcode == ID_OB)) { return true; } |