[Bf-blender-cvs] [ac2cdb21e69] blender2.8: Fix T56252: Selectable Bases includes hidden objects
Campbell Barton
noreply at git.blender.org
Tue Aug 7 05:25:31 CEST 2018
Commit: ac2cdb21e69b4dcfc4c273cfcf2b94f7afb789f5
Author: Campbell Barton
Date: Tue Aug 7 13:22:07 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBac2cdb21e69b4dcfc4c273cfcf2b94f7afb789f5
Fix T56252: Selectable Bases includes hidden objects
===================================================================
M source/blender/editors/screen/screen_context.c
===================================================================
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index ecfc9f2cca0..5a520540301 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -167,7 +167,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
}
else if (CTX_data_equals(member, "selectable_bases")) {
for (Base *base = view_layer->object_bases.first; base; base = base->next) {
- if ((base->flag & BASE_SELECTABLE) != 0) {
+ if ((base->flag & BASE_VISIBLE) && (base->flag & BASE_SELECTABLE) != 0) {
CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
}
}
More information about the Bf-blender-cvs
mailing list