[Bf-blender-cvs] [3af1113a96a] temp-asset-library-all: Merge branch 'master' into temp-asset-library-all

[Julian Eisel]

Commit: 3af1113a96af9299668f8696a58e8d2cc9dee12d
Author: Julian Eisel
Date:   Mon Jan 9 11:40:03 2023 +0100
Branches: temp-asset-library-all
https://developer.blender.org/rB3af1113a96af9299668f8696a58e8d2cc9dee12d

Merge branch 'master' into temp-asset-library-all

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



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

diff --cc source/blender/editors/asset/intern/asset_list.cc
index e086e5702d1,caceedbd4a5..2adf2a170e5
--- a/source/blender/editors/asset/intern/asset_list.cc
+++ b/source/blender/editors/asset/intern/asset_list.cc
@@@ -114,7 -111,7 +113,8 @@@ class AssetList : NonCopyable 
    void clear(bContext *C);
  
    bool needsRefetch() const;
+   bool isLoaded() const;
 +  asset_system::AssetLibrary *asset_library() const;
    void iterate(AssetListIterFn fn) const;
    bool listen(const wmNotifier &notifier) const;
    int size() const;
@@@ -181,11 -190,11 +181,16 @@@ bool AssetList::needsRefetch() cons
    return filelist_needs_force_reset(filelist_) || filelist_needs_reading(filelist_);
  }
  
+ bool AssetList::isLoaded() const
+ {
+   return filelist_is_ready(filelist_);
+ }
+ 
 +asset_system::AssetLibrary *AssetList::asset_library() const
 +{
 +  return reinterpret_cast<asset_system::AssetLibrary *>(filelist_asset_library(filelist_));
 +}
 +
  void AssetList::iterate(AssetListIterFn fn) const
  {
    FileList *files = filelist_;
diff --cc source/blender/editors/space_file/filelist.cc
index 44f846f8595,cd1c3f8280b..7447f5d7986
--- a/source/blender/editors/space_file/filelist.cc
+++ b/source/blender/editors/space_file/filelist.cc
@@@ -855,19 -850,12 +854,13 @@@ static bool is_filtered_asset(FileListI
  }
  
  static bool is_filtered_lib_type(FileListInternEntry *file,
-                                  const char *root,
+                                  const char * /*root*/,
                                   FileListFilter *filter)
  {
-   if (root) {
-     char path[FILE_MAX_LIBEXTRA], dir[FILE_MAX_LIBEXTRA], *group, *name;
- 
-     BLI_path_join(path, sizeof(path), root, file->relpath);
- 
-     if (BLO_library_path_explode(path, dir, &group, &name)) {
-       return is_filtered_id_file_type(file, group, name, filter);
-     }
+   if (file->typeflag & FILE_TYPE_BLENDERLIB) {
+     return is_filtered_id_file_type(file, file->blentype, file->name, filter);
    }
 +
    return is_filtered_file_type(file, filter);
  }
  
@@@ -2874,11 -2850,8 +2861,11 @@@ void filelist_entry_parent_select_set(F
    }
  }
  
- bool filelist_islibrary(struct FileList *filelist, char *dir, char **r_group)
+ bool filelist_islibrary(FileList *filelist, char *dir, char **r_group)
  {
 +  if (filelist->asset_library) {
 +    return true;
 +  }
    return BLO_library_path_explode(filelist->filelist.root, dir, r_group, nullptr);
  }