diff options
| author | Bastien Montagne <b.mont29@gmail.com> | 2020-02-10 20:05:19 +0300 |
|---|---|---|
| committer | Bastien Montagne <b.mont29@gmail.com> | 2020-02-10 20:05:19 +0300 |
| commit | e75e29ee478592742defb80d6d992173f4a635df (patch) | |
| tree | a43d9b93efe2a8838e45509c25a7c988c1cc8c22 /source/blender/blenloader/intern | |
| parent | c6e28f65139d6e7536789d9bf1895e7f7058ac92 (diff) | |
Cleanup: Rename `BKE_library_override_` functions to `BKE_lib_override_library_`
pqrt of T72604.
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 69affd4b614..d9849cfa770 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9783,7 +9783,7 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath) * we can re-generate overrides from their references. */ if (fd->memfile == NULL) { /* Do not apply in undo case! */ - BKE_main_override_library_update(bfd->main); + BKE_lib_override_library_main_update(bfd->main); } BKE_collections_after_lib_link(bfd->main); diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 990c70947c1..30ba20b97da 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -3782,7 +3782,7 @@ static bool write_file_handle(Main *mainvar, mywrite_flush(wd); OverrideLibraryStorage *override_storage = - wd->use_memfile ? NULL : BKE_override_library_operations_store_initialize(); + wd->use_memfile ? NULL : BKE_lib_override_library_operations_store_initialize(); /* This outer loop allows to save first data-blocks from real mainvar, * then the temp ones from override process, @@ -3807,7 +3807,7 @@ static bool write_file_handle(Main *mainvar, const bool do_override = !ELEM(override_storage, NULL, bmain) && id->override_library; if (do_override) { - BKE_override_library_operations_store_start(bmain, override_storage, id); + BKE_lib_override_library_operations_store_start(bmain, override_storage, id); } switch ((ID_Type)GS(id->name)) { @@ -3927,7 +3927,7 @@ static bool write_file_handle(Main *mainvar, } if (do_override) { - BKE_override_library_operations_store_end(override_storage, id); + BKE_lib_override_library_operations_store_end(override_storage, id); } } @@ -3936,7 +3936,7 @@ static bool write_file_handle(Main *mainvar, } while ((bmain != override_storage) && (bmain = override_storage)); if (override_storage) { - BKE_override_library_operations_store_finalize(override_storage); + BKE_lib_override_library_operations_store_finalize(override_storage); override_storage = NULL; } |