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

[Bastien Montagne]

Commit: 95b12e4fb990e358931b152e7b6d4c268592fbdf
Author: Bastien Montagne
Date:   Tue Aug 6 12:42:58 2019 +0200
Branches: asset-engine
https://developer.blender.org/rB95b12e4fb990e358931b152e7b6d4c268592fbdf

Merge branch 'master' into asset-engine

Conflicts:
	source/blender/blenloader/intern/versioning_defaults.c
	source/blender/windowmanager/intern/wm_files.c

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index c58f0eb5848,0dbb1a92f30..3e5ddd5b47f
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3534,37 -3533,40 +3534,70 @@@ void blo_do_versions_280(FileData *fd, 
      }
    }
  
+   if (!MAIN_VERSION_ATLEAST(bmain, 281, 1)) {
+     LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+       for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
+         if (md->type == eModifierType_DataTransfer) {
+           /* Now datatransfer's mix factor is multiplied with weights when any,
+            * instead of being ignored,
+            * we need to take care of that to keep 'old' files compatible. */
+           DataTransferModifierData *dtmd = (DataTransferModifierData *)md;
+           if (dtmd->defgrp_name[0] != '\0') {
+             dtmd->mix_factor = 1.0f;
+           }
+         }
+       }
+     }
+   }
+ 
    {
      /* Versioning code until next subversion bump goes here. */
+     if (U.view_rotate_sensitivity_turntable == 0) {
+       U.view_rotate_sensitivity_turntable = DEG2RADF(0.4f);
+       U.view_rotate_sensitivity_trackball = 1.0f;
+     }
+     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_TEXT) {
+             ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
+             ARegion *ar = do_versions_find_region_or_null(regionbase, RGN_TYPE_UI);
+             if (ar) {
+               ar->alignment = RGN_ALIGN_RIGHT;
+             }
+           }
+         }
+       }
+     }
    }
 +
 +  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;
 +            }
 +          }
 +        }
 +      }
 +    }
 +  }
  }
diff --cc source/blender/editors/space_file/filelist.c
index 35aa76dd4e2,f7dda1defe8..0d7d328ad9e
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@@ -1411,9 -1317,12 +1411,12 @@@ static void filelist_cache_init(FileLis
  
    cache->size = cache_size;
    cache->flags = FLC_IS_INIT;
+ 
+   /* We cannot translate from non-main thread, so init translated strings once from here. */
+   IMB_thumb_ensure_translations();
  }
  
 -static void filelist_cache_free(FileListEntryCache *cache)
 +static void filelist_cache_free(FileListEntryCache *cache, AssetEngine *ae)
  {
    FileDirEntry *entry, *entry_next;
  
diff --cc source/blender/windowmanager/intern/wm_files.c
index ad70c57e009,6a5800f4288..deeab1eced1
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -944,14 -921,9 +926,14 @@@ void wm_homefile_read(bContext *C
                                     filepath_startup,
                                     &(const struct BlendFileReadParams){
                                         .is_startup = true,
-                                        .skip_flags = skip_flags,
+                                        .skip_flags = skip_flags | BLO_READ_SKIP_USERDEF,
                                     },
-                                    NULL) != BKE_BLENDFILE_READ_FAIL;
+                                    NULL);
 +
 +#ifdef DEBUG_LIBRARY
 +      printf("Updating assets for: %s\n", filepath_startup);
 +#endif
 +      WM_operator_name_call(C, "WM_OT_assets_update_check", WM_OP_EXEC_DEFAULT, NULL);
      }
      if (BLI_listbase_is_empty(&U.themes)) {
        if (G.debug & G_DEBUG) {