diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-09-08 09:49:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-09-08 09:49:17 +0300 |
commit | 59653a450ec02ed4f94aa3f059da069525490a21 (patch) | |
tree | 1346a4969d734b87899d327f2d3bce7e011b9b8b /source/blender/blenloader | |
parent | d20b08281e0e5cf47b7b549910b6f5ab7f61e57d (diff) |
Cleanup: rename group to collection for internal instancing flag
Also update old comment.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c809a87b188..195bb1e7f9f 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10313,9 +10313,9 @@ static void add_loose_objects_to_scene(Main *mainvar, } if (flag & FILE_AUTOSELECT) { - base->flag |= BASE_SELECTED; /* Do NOT make base active here! screws up GUI stuff, - * if you want it do it on src/ level. */ + * if you want it do it at the editor level. */ + base->flag |= BASE_SELECTED; } BKE_scene_object_base_flag_sync_from_base(base); @@ -10371,6 +10371,8 @@ static void add_loose_object_data_to_scene(Main *mainvar, } if (flag & FILE_AUTOSELECT) { + /* Do NOT make base active here! screws up GUI stuff, + * if you want it do it at the editor level. */ base->flag |= BASE_SELECTED; } @@ -10398,7 +10400,7 @@ static void add_collections_to_scene(Main *mainvar, /* Give all objects which are tagged a base. */ LISTBASE_FOREACH (Collection *, collection, &mainvar->collections) { - if ((flag & FILE_GROUP_INSTANCE) && (collection->id.tag & LIB_TAG_DOIT)) { + if ((flag & FILE_COLLECTION_INSTANCE) && (collection->id.tag & LIB_TAG_DOIT)) { /* Any indirect collection should not have been tagged. */ BLI_assert((collection->id.tag & LIB_TAG_INDIRECT) == 0); |