[Bf-blender-cvs] [107486e6737] blender2.8: Fix poll for OUTLINER_OT_object_remove_from_collection
Dalai Felinto
noreply at git.blender.org
Tue Feb 6 21:41:23 CET 2018
Commit: 107486e67378779cd53d13c91df5afb1c858c1fa
Author: Dalai Felinto
Date: Tue Feb 6 18:37:37 2018 -0200
Branches: blender2.8
https://developer.blender.org/rB107486e67378779cd53d13c91df5afb1c858c1fa
Fix poll for OUTLINER_OT_object_remove_from_collection
Outliner groups mode support no filtering.
===================================================================
M source/blender/editors/space_outliner/outliner_collections.c
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list