[Bf-blender-cvs] [ec51355a47c] master: UI: Outliner Natural Sort

[Harley Acheson]

Commit: ec51355a47cba64e831ac8dc57f4ad9631876692
Author: Harley Acheson
Date:   Fri Aug 30 07:49:12 2019 -0700
Branches: master
https://developer.blender.org/rBec51355a47cba64e831ac8dc57f4ad9631876692

UI: Outliner Natural Sort

Collection contents alphabetical sort now uses a Natural Sort that takes number magnitude into account.

Differential Revision: https://developer.blender.org/D5636

Reviewed by Brecht Van Lommel

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

M	source/blender/editors/space_outliner/outliner_tree.c

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

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index c3168a7a532..41958656688 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1601,7 +1601,7 @@ typedef struct tTreeSort {
   short idcode;
 } tTreeSort;
 
-/* alphabetical comparator, tryping to put objects first */
+/* alphabetical comparator, trying to put objects first */
 static int treesort_alpha_ob(const void *v1, const void *v2)
 {
   const tTreeSort *x1 = v1, *x2 = v2;
@@ -1627,7 +1627,7 @@ static int treesort_alpha_ob(const void *v1, const void *v2)
       return (x1->te->flag & TE_CHILD_NOT_IN_COLLECTION) ? 1 : -1;
     }
 
-    comp = strcmp(x1->name, x2->name);
+    comp = BLI_natstrcmp(x1->name, x2->name);
 
     if (comp > 0) {
       return 1;
@@ -1659,7 +1659,7 @@ static int treesort_alpha(const void *v1, const void *v2)
   const tTreeSort *x1 = v1, *x2 = v2;
   int comp;
 
-  comp = strcmp(x1->name, x2->name);
+  comp = BLI_natstrcmp(x1->name, x2->name);
 
   if (comp > 0) {
     return 1;
@@ -1697,7 +1697,7 @@ static int treesort_obtype_alpha(const void *v1, const void *v2)
       }
     }
     else {
-      int comp = strcmp(x1->name, x2->name);
+      int comp = BLI_natstrcmp(x1->name, x2->name);
 
       if (comp > 0) {
         return 1;