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/blenloader | |
| parent | a99dcab148ed209409f3b2479ada12d869ae84b6 (diff) | |
Cleanup: rename object base flags to be more clear.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index aa7c48f4873..9c5d59d2404 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10040,7 +10040,7 @@ static void add_loose_objects_to_scene( if (flag & FILE_AUTOSELECT) { /* Note that link_object_postprocess() already checks for FILE_AUTOSELECT flag, * but it will miss objects from non-instantiated collections... */ - if (base->flag & BASE_SELECTABLED) { + if (base->flag & BASE_SELECTABLE) { base->flag |= BASE_SELECTED; BKE_scene_object_base_flag_sync_from_base(base); } @@ -10073,7 +10073,7 @@ static void add_collections_to_scene( BKE_collection_object_add(bmain, active_collection, ob); Base *base = BKE_view_layer_base_find(view_layer, ob); - if (base->flag & BASE_SELECTABLED) { + if (base->flag & BASE_SELECTABLE) { base->flag |= BASE_SELECTED; } @@ -10184,7 +10184,7 @@ static void link_object_postprocess(ID *id, Main *bmain, Scene *scene, ViewLayer BKE_scene_object_base_flag_sync_from_base(base); if (flag & FILE_AUTOSELECT) { - if (base->flag & BASE_SELECTABLED) { + if (base->flag & BASE_SELECTABLE) { base->flag |= BASE_SELECTED; BKE_scene_object_base_flag_sync_from_base(base); } diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 5fb2c4820d1..06017668c02 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -502,7 +502,7 @@ static void do_version_layers_to_collections(Main *bmain, Scene *scene) } for (Base *base = view_layer->object_bases.first; base; base = base->next) { - if ((base->flag & BASE_SELECTABLED) && (base->object->flag & SELECT)) { + if ((base->flag & BASE_SELECTABLE) && (base->object->flag & SELECT)) { base->flag |= BASE_SELECTED; } } @@ -531,7 +531,7 @@ static void do_version_layers_to_collections(Main *bmain, Scene *scene) /* convert selected bases */ for (Base *base = view_layer->object_bases.first; base; base = base->next) { - if ((base->flag & BASE_SELECTABLED) && (base->object->flag & SELECT)) { + if ((base->flag & BASE_SELECTABLE) && (base->object->flag & SELECT)) { base->flag |= BASE_SELECTED; } |