archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: remove useless extra-processing after BKE_id_new_name_validate() call.

Browse Source 
This function already handles sorting of ID in its listbase.
This commit is contained in:
Bastien Montagne
2019-03-06 11:20:23 +01:00
parent ac40cf76e5
commit a997c9b9bc
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/library.c
View File

@@ -2015,9 +2015,8 @@ void BLI_libblock_ensure_unique_name(Main *bmain, const char *name)
/* search for id */
idtest = BLI_findstring(lb, name + 2, offsetof(ID, name) + 2);
if (idtest != NULL) {
if (!BKE_id_new_name_validate(lb, idtest, idtest->name + 2)) {
id_sort_by_name(lb, idtest);
}
/* BKE_id_new_name_validate also takes care of sorting. */
BKE_id_new_name_validate(lb, idtest, NULL);
bmain->is_memfile_undo_written = false;
}
}

2
source/blender/blenloader/intern/versioning_250.c
View File

@@ -442,7 +442,7 @@ static void versions_gpencil_add_main(ListBase *lb, ID *id, const char *name)
*( (short *)id->name) = ID_GD;
BKE_id_new_name_validate(lb, id, name);
/* alphabetic insertion: is in new_id */
/* alphabetic insertion: is in BKE_id_new_name_validate */
if (G.debug & G_DEBUG)
printf("Converted GPencil to ID: %s\n", id->name + 2);