[Bf-blender-cvs] [a997c9b9bc8] master: Cleanup: remove useless extra-processing after BKE_id_new_name_validate() call.

[Bastien Montagne]

Commit: a997c9b9bc8053312d61d0e4c8db86c182e1bd51
Author: Bastien Montagne
Date:   Wed Mar 6 11:20:23 2019 +0100
Branches: master
https://developer.blender.org/rBa997c9b9bc8053312d61d0e4c8db86c182e1bd51

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

This function already handles sorting of ID in its listbase.

===================================================================

M	source/blender/blenkernel/intern/library.c
M	source/blender/blenloader/intern/versioning_250.c

===================================================================

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;
 	}
 }
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 59a1b57911c..5d7f37db0d1 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -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);