[Bf-blender-cvs] [e87ebf96238] asset-browser-poselib: Merge branch 'master' into asset-browser-poselib

[Julian Eisel]

Commit: e87ebf96238499921c9373304ee90a0f239100f4
Author: Julian Eisel
Date:   Mon Jun 21 10:51:10 2021 +0200
Branches: asset-browser-poselib
https://developer.blender.org/rBe87ebf96238499921c9373304ee90a0f239100f4

Merge branch 'master' into asset-browser-poselib

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 60650edcea6,0fe1267b871..fd014da3d32
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -30,9 -32,9 +32,11 @@@
  #include "DNA_listBase.h"
  #include "DNA_modifier_types.h"
  #include "DNA_text_types.h"
 +#include "DNA_workspace_types.h"
  
+ #include "BKE_animsys.h"
 +#include "BKE_asset.h"
+ #include "BKE_fcurve_driver.h"
  #include "BKE_lib_id.h"
  #include "BKE_main.h"
  #include "BKE_node.h"
@@@ -262,13 -365,43 +367,51 @@@ void blo_do_versions_300(FileData *fd, 
        }
      }
  
+     /* Initialize length-wise scale B-Bone settings. */
+     if (!DNA_struct_elem_find(fd->filesdna, "Bone", "int", "bbone_flag")) {
+       /* Update armature data and pose channels. */
+       LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) {
+         do_version_bones_bbone_len_scale(&arm->bonebase);
+       }
+ 
+       LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+         if (ob->pose) {
+           LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
+             copy_v3_fl3(pchan->scale_in, pchan->scale_in_x, 1.0f, pchan->scale_in_z);
+             copy_v3_fl3(pchan->scale_out, pchan->scale_out_x, 1.0f, pchan->scale_out_z);
+           }
+         }
+       }
+ 
+       /* Update action curves and drivers. */
+       LISTBASE_FOREACH (bAction *, act, &bmain->actions) {
+         LISTBASE_FOREACH_MUTABLE (FCurve *, fcu, &act->curves) {
+           do_version_bbone_len_scale_fcurve_fix(fcu);
+         }
+       }
+ 
+       BKE_animdata_main_cb(bmain, do_version_bbone_len_scale_animdata_cb, NULL);
+     }
+   }
+ 
+   /**
+    * Versioning code until next subversion bump goes here.
+    *
+    * \note Be sure to check when bumping the version:
+    * - "versioning_userdef.c", #blo_do_versions_userdef
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
+     /* Keep this block, even when empty. */
 +    {
 +      if (!DNA_struct_elem_find(
 +              fd->filesdna, "WorkSpace", "AssetLibraryReference", "active_asset_library")) {
 +        LISTBASE_FOREACH (WorkSpace *, workspace, &bmain->workspaces) {
 +          BKE_asset_library_reference_init_default(&workspace->active_asset_library);
 +        }
 +      }
 +    }
    }
  }
diff --cc source/blender/editors/space_file/filelist.c
index 0a22e5c0f65,37a32164cfc..d5e69a32574
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@@ -1555,10 -1553,8 +1555,9 @@@ static void filelist_cache_preview_free
  static void filelist_cache_preview_ensure_running(FileListEntryCache *cache)
  {
    if (!cache->previews_pool) {
-     cache->previews_pool = BLI_task_pool_create_background(
-         cache, TASK_PRIORITY_LOW, TASK_ISOLATION_ON);
+     cache->previews_pool = BLI_task_pool_create_background(cache, TASK_PRIORITY_LOW);
      cache->previews_done = BLI_thread_queue_init();
 +    cache->previews_todo_count = 0;
  
      IMB_thumb_locks_acquire();
    }