diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-06 13:20:23 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-06 17:19:29 +0300 |
| commit | a997c9b9bc8053312d61d0e4c8db86c182e1bd51 (patch) | |
| tree | 71fedf3b980634442247001e2fd17859385dc0b5 /source/blender/blenkernel/intern/library.c | |
| parent | ac40cf76e5c03af2eca9d3076ec15578660ab245 (diff) | |
Cleanup: remove useless extra-processing after BKE_id_new_name_validate() call.
This function already handles sorting of ID in its listbase.
Diffstat (limited to 'source/blender/blenkernel/intern/library.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 3dfc6e4007a..af76425c3c7 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -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; } } |