Merge branch 'blender-v2.90-release' into master

2020-07-30 11:24:39 -06:00 · 2020-07-30 11:24:39 -06:00 · 9132fd8825
parent 820ca419e0 f45f8a7a89
commit 9132fd8825
1 changed files with 3 additions and 1 deletions
--- 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;
  }