[Bf-blender-cvs] [e859086b18e] filebrowser_redesign: Merge branch 'master' into filebrowser_redesign

[Julian Eisel]

Commit: e859086b18e0ad148f1ec58224ca7ac5e303526d
Author: Julian Eisel
Date:   Sun Sep 1 13:39:30 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rBe859086b18e0ad148f1ec58224ca7ac5e303526d

Merge branch 'master' into filebrowser_redesign

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 4d78fc29b2c,ed3b1613b2a..22a1a99ed82
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3706,29 -3706,10 +3706,35 @@@ void blo_do_versions_280(FileData *fd, 
  
    {
      /* 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;
+       }
+     }
++
 +    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;
 +            ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
 +            ARegion *ar_ui = do_versions_find_region(regionbase, RGN_TYPE_UI);
 +            ARegion *ar_header = do_versions_find_region(regionbase, RGN_TYPE_HEADER);
 +
 +            if (ar_ui && ar_header) {
 +              /* Reinsert UI region so that it spawns entire area width */
 +              BLI_remlink(regionbase, ar_ui);
 +              BLI_insertlinkafter(regionbase, ar_header, ar_ui);
 +
 +              ar_ui->flag |= RGN_FLAG_DYNAMIC_SIZE;
 +            }
 +
 +            if (sfile->params) {
 +              sfile->params->details_flags |= FILE_DETAILS_SIZE | FILE_DETAILS_DATETIME;
 +            }
 +          }
 +        }
 +      }
 +    }
    }
  }
diff --cc source/blender/editors/space_file/filelist.c
index de834f0fa4b,ee86a583974..fdc101f3d82
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@@ -443,10 -434,10 +443,10 @@@ static int compare_name(void *user_data
    name1 = entry1->name;
    name2 = entry2->name;
  
-   return compare_apply_inverted(BLI_natstrcmp(name1, name2), sort_data);
 -  return BLI_strcasecmp_natural(name1, name2);
++  return compare_apply_inverted(BLI_strcasecmp_natural(name1, name2), sort_data);
  }
  
 -static int compare_date(void *UNUSED(user_data), const void *a1, const void *a2)
 +static int compare_date(void *user_data, const void *a1, const void *a2)
  {
    const FileListInternEntry *entry1 = a1;
    const FileListInternEntry *entry2 = a2;
@@@ -471,10 -461,10 +471,10 @@@
    name1 = entry1->name;
    name2 = entry2->name;
  
-   return compare_apply_inverted(BLI_natstrcmp(name1, name2), sort_data);
 -  return BLI_strcasecmp_natural(name1, name2);
++  return compare_apply_inverted(BLI_strcasecmp_natural(name1, name2), sort_data);
  }
  
 -static int compare_size(void *UNUSED(user_data), const void *a1, const void *a2)
 +static int compare_size(void *user_data, const void *a1, const void *a2)
  {
    const FileListInternEntry *entry1 = a1;
    const FileListInternEntry *entry2 = a2;
@@@ -499,10 -488,10 +499,10 @@@
    name1 = entry1->name;
    name2 = entry2->name;
  
-   return compare_apply_inverted(BLI_natstrcmp(name1, name2), sort_data);
 -  return BLI_strcasecmp_natural(name1, name2);
++  return compare_apply_inverted(BLI_strcasecmp_natural(name1, name2), sort_data);
  }
  
 -static int compare_extension(void *UNUSED(user_data), const void *a1, const void *a2)
 +static int compare_extension(void *user_data, const void *a1, const void *a2)
  {
    const FileListInternEntry *entry1 = a1;
    const FileListInternEntry *entry2 = a2;
@@@ -558,7 -546,7 +558,7 @@@
    name1 = entry1->name;
    name2 = entry2->name;
  
-   return compare_apply_inverted(BLI_natstrcmp(name1, name2), sort_data);
 -  return BLI_strcasecmp_natural(name1, name2);
++  return compare_apply_inverted(BLI_strcasecmp_natural(name1, name2), sort_data);
  }
  
  void filelist_sort(struct FileList *filelist)