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

[Bastien Montagne]

Commit: bf72a5ba901549041c6745f44e821af2a7e4777a
Author: Bastien Montagne
Date:   Thu Oct 10 11:02:13 2019 +0200
Branches: asset-engine
https://developer.blender.org/rBbf72a5ba901549041c6745f44e821af2a7e4777a

Merge branch 'master' into asset-engine

 Conflicts:
	source/blender/blenloader/intern/versioning_280.c
	source/blender/editors/space_file/filesel.c

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 732ceaa9a9f,58643e34922..713685e811b
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3845,35 -3865,14 +3866,43 @@@ void blo_do_versions_280(FileData *fd, 
      }
    }
  
+   if (!MAIN_VERSION_ATLEAST(bmain, 281, 15)) {
+     LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+       if (scene->toolsettings->snap_node_mode == SCE_SNAP_MODE_NODE_X) {
+         scene->toolsettings->snap_node_mode = SCE_SNAP_MODE_GRID;
+       }
+     }
+   }
+ 
 +  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. */
      if (!DNA_struct_elem_find(
diff --cc source/blender/editors/space_file/filesel.c
index e55a977f373,0b6d5661577..86f9b2c95e3
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@@ -306,13 -293,12 +293,12 @@@ short ED_fileselect_set_params(SpaceFil
    }
    else {
      /* default values, if no operator */
 -    params->type = FILE_UNIX;
 +    params->type = FILE_LOADLIB;
-     params->flag |= FILE_HIDE_DOT;
+     params->flag |= U_default.file_space_data.flag;
      params->flag &= ~FILE_DIRSEL_ONLY;
      params->display = FILE_VERTICALDISPLAY;
-     params->display_previous = FILE_DEFAULTDISPLAY;
      params->sort = FILE_SORT_ALPHA;
 -    params->filter = 0;
 +    params->filter = FILE_TYPE_FOLDER | FILE_TYPE_BLENDERLIB;
      params->filter_glob[0] = '\0';
    }