diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-08 20:19:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-08 20:50:44 +0300 |
| commit | ae2af4692009fe2c3fc97783f6d69aaa7cac5123 (patch) | |
| tree | 897af6264bd392b92712a4c2e5077be9384297af /source/blender/blenkernel/intern/object.c | |
| parent | 54985ab5f569f4623695c693dedda7c000e1e73f (diff) | |
Fix inconsistent naming and behavior for base visible/selected/editable.
Fixes T60251.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 8ce43049265..78e22c203ab 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3670,8 +3670,8 @@ LinkNode *BKE_object_relational_superset(struct ViewLayer *view_layer, eObjectSe obrel_list_add(&links, ob); } else { - if ((objectSet == OB_SET_SELECTED && TESTBASELIB_BGMODE(((View3D *)NULL), base)) || - (objectSet == OB_SET_VISIBLE && BASE_EDITABLE_BGMODE(((View3D *)NULL), base))) + if ((objectSet == OB_SET_SELECTED && BASE_SELECTED_EDITABLE(((View3D *)NULL), base)) || + (objectSet == OB_SET_VISIBLE && BASE_EDITABLE(((View3D *)NULL), base))) { Object *ob = base->object; @@ -3701,7 +3701,7 @@ LinkNode *BKE_object_relational_superset(struct ViewLayer *view_layer, eObjectSe if (includeFilter & (OB_REL_CHILDREN | OB_REL_CHILDREN_RECURSIVE)) { Base *local_base; for (local_base = view_layer->object_bases.first; local_base; local_base = local_base->next) { - if (BASE_EDITABLE_BGMODE(((View3D *)NULL), local_base)) { + if (BASE_EDITABLE(((View3D *)NULL), local_base)) { Object *child = local_base->object; if (obrel_list_test(child)) { |