diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-25 14:50:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-25 15:09:17 +0300 |
| commit | 817bf582c27d6aa2d19027bb97ed3f708cf6347c (patch) | |
| tree | e6e6f0afb0bb8fc5a8711fb66c6aa9b39a8d3508 /source/blender/blenkernel/intern/collection.c | |
| parent | a99dcab148ed209409f3b2479ada12d869ae84b6 (diff) | |
Cleanup: rename object base flags to be more clear.
Diffstat (limited to 'source/blender/blenkernel/intern/collection.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collection.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index eef4a6210c8..8a3d27ca790 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -317,13 +317,13 @@ static void collection_object_cache_fill(ListBase *lb, Collection *collection, i if (((child_restrict & COLLECTION_RESTRICT_VIEW) == 0) && ((object_restrict & OB_RESTRICT_VIEW) == 0)) { - base->flag |= BASE_VISIBLE_VIEWPORT; + base->flag |= BASE_ENABLED_VIEWPORT; } if (((child_restrict & COLLECTION_RESTRICT_RENDER) == 0) && ((object_restrict & OB_RESTRICT_RENDER) == 0)) { - base->flag |= BASE_VISIBLE_RENDER; + base->flag |= BASE_ENABLED_RENDER; } } @@ -903,7 +903,7 @@ static bool collection_objects_select(ViewLayer *view_layer, Collection *collect } } else { - if ((base->flag & BASE_SELECTABLED) && !(base->flag & BASE_SELECTED)) { + if ((base->flag & BASE_SELECTABLE) && !(base->flag & BASE_SELECTED)) { base->flag |= BASE_SELECTED; changed = true; } |