Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2018-02-06 23:37:37 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-02-06 23:37:37 +0300
commit107486e67378779cd53d13c91df5afb1c858c1fa (patch)
tree3037f78e34edc1f1097d9cb6a2800f026ce043e3 /source
parentfcb430afbaa6857b59ec4700a1d656f553e8817b (diff)
Fix poll for OUTLINER_OT_object_remove_from_collection
Outliner groups mode support no filtering.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_outliner/outliner_collections.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c
index 14e27bcafa9..ed01e003030 100644
--- a/source/blender/editors/space_outliner/outliner_collections.c
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -571,8 +571,10 @@ static int object_collection_remove_poll(bContext *C)
return 0;
}
- if ((so->filter & (SO_FILTER_ENABLE | SO_FILTER_NO_COLLECTION)) ==
- (SO_FILTER_ENABLE | SO_FILTER_NO_COLLECTION))
+ /* Groups don't support filtering. */
+ if ((so->outlinevis != SO_GROUPS) &&
+ ((so->filter & (SO_FILTER_ENABLE | SO_FILTER_NO_COLLECTION)) ==
+ (SO_FILTER_ENABLE | SO_FILTER_NO_COLLECTION)))
{
return 0;
}