diff options
author | Nathan Craddock <nzcraddock@gmail.com> | 2020-07-30 06:46:04 +0300 |
---|---|---|
committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-07-30 20:19:07 +0300 |
commit | f45f8a7a898575819a8c687ed6935ee94ddefa8e (patch) | |
tree | c511ec3a9f45b4203fabccc740c3ae6c264b8612 /source/blender/editors/space_outliner/outliner_tree.c | |
parent | 4089b07aa05c68fcbefa0b8b6c574173953e1c85 (diff) |
Fix T79278: Selected object filter skipping collection instances
Collection instance datablocks were not filtered out when only showing
the selected object. They were treated as a collection (which should
show when filtering objects). Adds a case to check if the parent is an
object.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tree.c')
-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; } |