diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-26 18:41:50 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-26 18:44:00 +0300 |
| commit | 43badbd631cf130e4d7b2ec9a4a4ef31c5225ef1 (patch) | |
| tree | fdf94f30e48e55f0699ad0bef1a12504bb8cef39 /source/blender/blenloader | |
| parent | 984cd29fdab0f3da4ad50d4df193b1c6710c904f (diff) | |
Rename: FILE_ACTIVELAY > FILE_ACTIVE_COLLECTION
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 60b77a25646..c387f4669dc 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10112,7 +10112,7 @@ static SceneCollection *get_scene_collection_active_or_create(struct Scene *scen { LayerCollection *lc = NULL; - if (flag & FILE_ACTIVELAY) { + if (flag & FILE_ACTIVE_COLLECTION) { lc = BKE_layer_collection_get_active_ensure(scene, sl); } else { @@ -10408,7 +10408,7 @@ static void library_link_end(Main *mainl, FileData **fd, const short flag, Scene * Only directly linked objects & groups are instantiated by `BLO_library_link_named_part_ex()` & co, * here we handle indirect ones and other possible edge-cases. */ if (scene) { - SceneCollection *sc = get_scene_collection_active_or_create(scene, sl, FILE_ACTIVELAY); + SceneCollection *sc = get_scene_collection_active_or_create(scene, sl, FILE_ACTIVE_COLLECTION); give_base_to_objects(mainvar, scene, sl, sc, curlib, flag); if (flag & FILE_GROUP_INSTANCE) { |