diff options
author | Bastien Montagne <bastien@blender.org> | 2021-08-24 18:19:41 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-08-24 18:19:41 +0300 |
commit | 551521cfa48022d4cc32ea337ad3f9147a49e887 (patch) | |
tree | 682234dfea695ff93d2401db522b7f8243ae256c /source/blender/blenkernel/intern/lib_id.c | |
parent | b55c02a20694d6c7795c5504f458b1a9cb3a4c06 (diff) |
Cleanup: ID management: Remove useless internal for `BKE_lib_id_clear_library_data`.
This static internal `_ex` function was not doing anything extra, just
move back whole code to public API `BKE_lib_id_clear_library_data`.
Diffstat (limited to 'source/blender/blenkernel/intern/lib_id.c')
-rw-r--r-- | source/blender/blenkernel/intern/lib_id.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index 495d5d79eb9..aa458bc1b27 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -153,7 +153,7 @@ static int lib_id_clear_library_data_users_update_cb(LibraryIDLinkCallbackData * * Pull an ID out of a library (make it local). Only call this for IDs that * don't have other library users. */ -static void lib_id_clear_library_data_ex(Main *bmain, ID *id) +void BKE_lib_id_clear_library_data(Main *bmain, ID *id) { const bool id_in_mainlist = (id->tag & LIB_TAG_NO_MAIN) == 0 && (id->flag & LIB_EMBEDDED_DATA) == 0; @@ -193,17 +193,12 @@ static void lib_id_clear_library_data_ex(Main *bmain, ID *id) * IDs here, this is down automatically in `lib_id_expand_local_cb()`. */ Key *key = BKE_key_from_id(id); if (key != NULL) { - lib_id_clear_library_data_ex(bmain, &key->id); + BKE_lib_id_clear_library_data(bmain, &key->id); } DEG_relations_tag_update(bmain); } -void BKE_lib_id_clear_library_data(Main *bmain, ID *id) -{ - lib_id_clear_library_data_ex(bmain, id); -} - void id_lib_extern(ID *id) { if (id && ID_IS_LINKED(id)) { @@ -369,7 +364,7 @@ static int lib_id_expand_local_cb(LibraryIDLinkCallbackData *cb_data) if (*id_pointer != NULL && ID_IS_LINKED(*id_pointer)) { BLI_assert(*id_pointer != id_self); - lib_id_clear_library_data_ex(bmain, *id_pointer); + BKE_lib_id_clear_library_data(bmain, *id_pointer); } return IDWALK_RET_NOP; } @@ -429,7 +424,7 @@ void BKE_lib_id_make_local_generic(Main *bmain, ID *id, const int flags) if (lib_local || is_local) { if (!is_lib) { - lib_id_clear_library_data_ex(bmain, id); + BKE_lib_id_clear_library_data(bmain, id); BKE_lib_id_expand_local(bmain, id); } else { @@ -2014,7 +2009,7 @@ void BKE_library_make_local(Main *bmain, * currently there are some indirect usages. So instead of making a copy that we'll likely * get rid of later, directly make that data block local. * Saves a tremendous amount of time with complex scenes... */ - lib_id_clear_library_data_ex(bmain, id); + BKE_lib_id_clear_library_data(bmain, id); BKE_lib_id_expand_local(bmain, id); id->tag &= ~LIB_TAG_DOIT; |