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

[Julian Eisel]

Commit: 8209f25c3b08f726a221cbcbcfa48dbea597c772
Author: Julian Eisel
Date:   Sun Aug 18 13:24:15 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rB8209f25c3b08f726a221cbcbcfa48dbea597c772

Merge branch 'master' into filebrowser_redesign

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 0ef566d9e89,149b02e7761..837c78d303f
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3568,33 -3687,10 +3687,38 @@@ void blo_do_versions_280(FileData *fd, 
          }
        }
      }
+     for (Mesh *mesh = bmain->meshes.first; mesh; mesh = mesh->id.next) {
+       if (mesh->remesh_voxel_size == 0.0f) {
+         mesh->remesh_voxel_size = 0.1f;
+       }
+     }
    }
 +
 +  {
 +    /* Versioning code until next subversion bump goes here. */
 +    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/blenloader/intern/versioning_userdef.c
index 02c777ee9b9,1284f2dcddc..2ef1a5c096c
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@@ -145,7 -145,8 +145,12 @@@ static void do_versions_theme(const Use
     * Include next version bump.
     */
    {
+     FROM_DEFAULT_V4_UCHAR(space_outliner.selected_highlight);
+     FROM_DEFAULT_V4_UCHAR(space_outliner.active);
++
++
++
 +    FROM_DEFAULT_V4_UCHAR(space_file.execution_buts);
    }
  
  #undef FROM_DEFAULT_V4_UCHAR
diff --cc source/blender/windowmanager/WM_api.h
index a479ab62b88,0f0d74c259b..6ff2f11226a
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -162,7 -162,8 +162,8 @@@ enum 
    WM_WINDOW_RENDER = 1,
    WM_WINDOW_USERPREFS,
    WM_WINDOW_DRIVERS,
+   WM_WINDOW_INFO,
 -  // WM_WINDOW_FILESEL // UNUSED
 +  WM_WINDOW_FILESEL,
  };
  
  struct wmWindow *WM_window_open(struct bContext *C, const struct rcti *rect);
diff --cc source/blender/windowmanager/intern/wm_window.c
index 4c095e0dca0,47491813f70..00ed203c208
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -889,21 -888,17 +889,24 @@@ wmWindow *WM_window_open_temp(bContext 
    CTX_wm_area_set(C, sa);
  
    if (type == WM_WINDOW_RENDER) {
 -    ED_area_newspace(C, sa, SPACE_IMAGE, false);
 +    space_type = SPACE_IMAGE;
    }
    else if (type == WM_WINDOW_DRIVERS) {
 -    ED_area_newspace(C, sa, SPACE_GRAPH, false);
 +    space_type = SPACE_GRAPH;
 +  }
 +  else if (type == WM_WINDOW_USERPREFS) {
 +    space_type = SPACE_USERPREF;
 +  }
 +  else if (type == WM_WINDOW_FILESEL) {
 +    space_type = SPACE_FILE;
    }
+   else if (type == WM_WINDOW_INFO) {
+     ED_area_newspace(C, sa, SPACE_INFO, false);
+   }
    else {
 -    ED_area_newspace(C, sa, SPACE_USERPREF, false);
 +    BLI_assert(false);
    }
 +  ED_area_newspace(C, sa, space_type, false);
  
    ED_screen_change(C, screen);
    ED_screen_refresh(CTX_wm_manager(C), win); /* test scale */