griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Rename BLI_libblock_ensure_unique_name to use BKE_ prefix.

Browse Source 
`BLI_` name was given in some cleanup commit long ago (641d4e2b7f),
assuming this was a mistake...
This commit is contained in:
Bastien Montagne
2024-01-15 13:04:00 +01:00
parent 6f3702740b
commit a4331be6c4
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_lib_id.h
View File

@@ -207,7 +207,7 @@ void BKE_libblock_rename(struct Main *bmain, struct ID *id, const char *name) AT
* Use after setting the ID's name
* When name exists: call 'new_id'
*/
void BLI_libblock_ensure_unique_name(struct Main *bmain, ID *id) ATTR_NONNULL();
void BKE_libblock_ensure_unique_name(struct Main *bmain, ID *id) ATTR_NONNULL();
struct ID *BKE_libblock_find_name(struct Main *bmain,
short type,

2
source/blender/blenkernel/intern/lib_id.cc
View File

@@ -2008,7 +2008,7 @@ void BKE_library_make_local(Main *bmain,
#endif
}
void BLI_libblock_ensure_unique_name(Main *bmain, ID *id)
void BKE_libblock_ensure_unique_name(Main *bmain, ID *id)
{
ListBase *lb;

2
source/blender/blenloader/intern/versioning_common.cc
View File

@@ -104,7 +104,7 @@ ID *do_versions_rename_id(Main *bmain,
BKE_main_namemap_remove_name(bmain, id, id->name + 2);
BLI_strncpy(id->name + 2, name_dst, sizeof(id->name) - 2);
/* We know it's unique, this just sorts. */
BLI_libblock_ensure_unique_name(bmain, id);
BKE_libblock_ensure_unique_name(bmain, id);
}
return id;
}

2
source/blender/blenloader/intern/versioning_defaults.cc
View File

@@ -531,7 +531,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
if (!STREQ(screen->id.name + 2, workspace->id.name + 2)) {
BKE_main_namemap_remove_name(bmain, &screen->id, screen->id.name + 2);
BLI_strncpy(screen->id.name + 2, workspace->id.name + 2, sizeof(screen->id.name) - 2);
BLI_libblock_ensure_unique_name(bmain, &screen->id);
BKE_libblock_ensure_unique_name(bmain, &screen->id);
}
}

6
source/blender/editors/space_outliner/outliner_draw.cc
View File

@@ -686,7 +686,7 @@ static void namebutton_fn(bContext *C, void *tsep, char *oldname)
if (tselem->type == TSE_SOME_ID) {
BKE_main_namemap_remove_name(bmain, tselem->id, oldname);
BLI_libblock_ensure_unique_name(bmain, tselem->id);
BKE_libblock_ensure_unique_name(bmain, tselem->id);
WM_msg_publish_rna_prop(mbus, tselem->id, tselem->id, ID, name);
@@ -754,7 +754,7 @@ static void namebutton_fn(bContext *C, void *tsep, char *oldname)
case TSE_NLA_ACTION: {
bAction *act = (bAction *)tselem->id;
BKE_main_namemap_remove_name(bmain, &act->id, oldname);
BLI_libblock_ensure_unique_name(bmain, &act->id);
BKE_libblock_ensure_unique_name(bmain, &act->id);
WM_msg_publish_rna_prop(mbus, &act->id, &act->id, ID, name);
DEG_id_tag_update(tselem->id, ID_RECALC_COPY_ON_WRITE);
break;
@@ -876,7 +876,7 @@ static void namebutton_fn(bContext *C, void *tsep, char *oldname)
/* The ID is a #Collection, not a #LayerCollection */
Collection *collection = (Collection *)tselem->id;
BKE_main_namemap_remove_name(bmain, &collection->id, oldname);
BLI_libblock_ensure_unique_name(bmain, &collection->id);
BKE_libblock_ensure_unique_name(bmain, &collection->id);
WM_msg_publish_rna_prop(mbus, &collection->id, &collection->id, ID, name);
WM_event_add_notifier(C, NC_ID | NA_RENAME, nullptr);
DEG_id_tag_update(tselem->id, ID_RECALC_COPY_ON_WRITE);

2
source/blender/makesrna/intern/rna_ID.cc
View File

@@ -286,7 +286,7 @@ void rna_ID_name_set(PointerRNA *ptr, const char *value)
BKE_main_namemap_remove_name(G_MAIN, id, id->name + 2);
BLI_strncpy_utf8(id->name + 2, value, sizeof(id->name) - 2);
BLI_assert(BKE_id_is_in_global_main(id));
BLI_libblock_ensure_unique_name(G_MAIN, id);
BKE_libblock_ensure_unique_name(G_MAIN, id);
if (GS(id->name) == ID_OB) {
Object *ob = (Object *)id;