[Bf-blender-cvs] [6ccb1999fdb] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 6ccb1999fdb5dc57a38e7c25e6006ce79b7a00dd
Author: Bastien Montagne
Date:   Mon Sep 2 11:25:00 2019 +0200
Branches: asset-engine
https://developer.blender.org/rB6ccb1999fdb5dc57a38e7c25e6006ce79b7a00dd

Merge branch 'master' into asset-engine

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 1dbd296906e,ed3b1613b2a..1cc92c70c44
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3705,37 -3704,12 +3705,42 @@@ void blo_do_versions_280(FileData *fd, 
      FOREACH_MAIN_ID_END;
    }
  
 +  if (1 ||
 +      !DNA_struct_find(fd->filesdna,
 +                       "AssetUUID")) { /* struct_find will have to wait, not working for now... */
 +    /* Move non-op filebrowsers to 'library browsing' type/mode. */
 +    for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
 +      for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 +        for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 +          if (sl->spacetype == SPACE_FILE) {
 +            SpaceFile *sfile = (SpaceFile *)sl;
 +            if (sfile->params != NULL) {
 +              sfile->params->type = FILE_LOADLIB;
 +              sfile->params->filter = FILE_TYPE_FOLDER | FILE_TYPE_BLENDERLIB;
 +              /* For now, always init filterid to 'all true' */
 +              sfile->params->filter_id = FILTER_ID_AC | FILTER_ID_AR | FILTER_ID_BR |
 +                                         FILTER_ID_CA | FILTER_ID_CU | FILTER_ID_GD |
 +                                         FILTER_ID_GR | FILTER_ID_IM | FILTER_ID_LA |
 +                                         FILTER_ID_LS | FILTER_ID_LT | FILTER_ID_MA |
 +                                         FILTER_ID_MB | FILTER_ID_MC | FILTER_ID_ME |
 +                                         FILTER_ID_MSK | FILTER_ID_NT | FILTER_ID_OB |
 +                                         FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC |
 +                                         FILTER_ID_SCE | FILTER_ID_SPK | FILTER_ID_SO |
 +                                         FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF |
 +                                         FILTER_ID_WO | FILTER_ID_CF;
 +            }
 +          }
 +        }
 +      }
 +    }
 +  }
 +
    {
      /* Versioning code until next subversion bump goes here. */
+     for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
+       if (br->ob_mode & OB_MODE_SCULPT && br->normal_radius_factor == 0.0f) {
+         br->normal_radius_factor = 0.5f;
+       }
+     }
    }
  }
diff --cc source/blender/editors/space_file/filelist.c
index c5e88f7ce28,ee86a583974..24e71bb6179
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@@ -554,21 -546,33 +554,21 @@@ static int compare_extension(void *UNUS
    name1 = entry1->name;
    name2 = entry2->name;
  
-   return BLI_natstrcmp(name1, name2);
+   return BLI_strcasecmp_natural(name1, name2);
  }
  
 -void filelist_sort(struct FileList *filelist)
 +static bool filelist_need_sorting(struct FileList *filelist)
  {
 -  if ((filelist->flags & FL_NEED_SORTING) && (filelist->sort != FILE_SORT_NONE)) {
 -    switch (filelist->sort) {
 -      case FILE_SORT_ALPHA:
 -        BLI_listbase_sort_r(&filelist->filelist_intern.entries, compare_name, NULL);
 -        break;
 -      case FILE_SORT_TIME:
 -        BLI_listbase_sort_r(&filelist->filelist_intern.entries, compare_date, NULL);
 -        break;
 -      case FILE_SORT_SIZE:
 -        BLI_listbase_sort_r(&filelist->filelist_intern.entries, compare_size, NULL);
 -        break;
 -      case FILE_SORT_EXTENSION:
 -        BLI_listbase_sort_r(&filelist->filelist_intern.entries, compare_extension, NULL);
 -        break;
 -      case FILE_SORT_NONE: /* Should never reach this point! */
 -      default:
 -        BLI_assert(0);
 -        break;
 -    }
 +  return (((filelist->flags & FL_NEED_SORTING) ||
 +           (filelist->ae && (filelist->ae->flag & AE_DIRTY_SORTING))) &&
 +          (filelist->sort != FILE_SORT_NONE));
 +}
  
 -    filelist_filter_clear(filelist);
 -    filelist->flags &= ~FL_NEED_SORTING;
 +static void filelist_need_sorting_clear(struct FileList *filelist)
 +{
 +  filelist->flags &= ~FL_NEED_SORTING;
 +  if (filelist->ae) {
 +    filelist->ae->flag &= ~AE_DIRTY_SORTING;
    }
  }