Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-01-21 18:29:29 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-01-21 18:29:29 +0400
commit8bcd8cb0bf024fd4f51111b2f1e4395fed0dd09d (patch)
tree702e5a1dfb0715a9dbe2f604ee3e9364046cf5f2 /source/blender/editors/space_file
parentba49d7e0e338b2b85cc162d265280bac8dc859cc (diff)
Revert "Fix T38303: Inconsistent sorting of names in Append/Link view"
This reverts commit ba49d7e0e338b2b85cc162d265280bac8dc859cc.
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r--source/blender/editors/space_file/filelist.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 113c7e77d73..748a0bd884c 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -188,15 +188,8 @@ static int compare_name(const void *a1, const void *a2)
if (strcmp(entry2->relname, ".") == 0) return (1);
if (strcmp(entry1->relname, "..") == 0) return (-1);
if (strcmp(entry2->relname, "..") == 0) return (1);
-
- {
- int cmp = BLI_natstrcmp(entry1->relname, entry2->relname);
- if (cmp == 0) {
- /* when strings are a case insensitive match, we don't want a random order for qsort [#38303] */
- cmp = strcmp(entry1->relname, entry2->relname);
- }
- return cmp;
- }
+
+ return (BLI_natstrcmp(entry1->relname, entry2->relname));
}
static int compare_date(const void *a1, const void *a2)