blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

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
This commit is contained in:
Harley Acheson 2019-08-30 07:49:12 -07:00
parent e0c792135a
commit ec51355a47
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_outliner/outliner_tree.c
View File

@ -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;