[Bf-blender-cvs] [5c580ff4574] master: Fix asset-only loading optimizatoin not working as intended

Julian Eisel noreply at git.blender.org
Thu Dec 1 11:42:31 CET 2022


Commit: 5c580ff45746fa79057788562a74b25e40ca7ec4
Author: Julian Eisel
Date:   Wed Nov 30 21:05:19 2022 +0100
Branches: master
https://developer.blender.org/rB5c580ff45746fa79057788562a74b25e40ca7ec4

Fix asset-only loading optimizatoin not working as intended

Introduced in fc7beac8d6f4, but I think this never worked because the
`asset_library_ref` of the temporary file-list used for reading in a
background thread is nulled. Now there's a different pointer that we can
use that works properly.

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

M	source/blender/editors/space_file/filelist.cc

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

diff --git a/source/blender/editors/space_file/filelist.cc b/source/blender/editors/space_file/filelist.cc
index beb1387b26e..3374da082d8 100644
--- a/source/blender/editors/space_file/filelist.cc
+++ b/source/blender/editors/space_file/filelist.cc
@@ -3614,7 +3614,7 @@ static void filelist_readjob_recursive_dir_add_items(const bool do_lib,
       }
       /* Only load assets when browsing an asset library. For normal file browsing we return all
        * entries. `FLF_ASSETS_ONLY` filter can be enabled/disabled by the user. */
-      if (filelist->asset_library_ref) {
+      if (filelist->asset_library) {
         list_lib_options |= LIST_LIB_ASSETS_ONLY;
       }
       std::optional<int> lib_entries_num = filelist_readjob_list_lib(



More information about the Bf-blender-cvs mailing list