blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

WIP: Rewrite asset browser as separate editor #107576

Draft
Julian Eisel wants to merge 95 commits from asset-browser-frontend-split into main
pull from: asset-browser-frontend-split
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 95 Files Changed 78 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f41368cf02 - Show all commits

8
source/blender/editors/asset/intern/asset_list.cc
View File

@ -134,7 +134,7 @@ class AssetList : NonCopyable {
int size() const;
void tagMainDataDirty() const;
void remapID(ID *id_old, ID *id_new) const;
AssetLibrary &asset_library() const;
AssetLibrary *asset_library() const;
StringRef filepath() const;
};
@ -327,9 +327,9 @@ StringRef AssetList::filepath() const
return filelist_dir(filelist_);
}
AssetLibrary &AssetList::asset_library() const
AssetLibrary *AssetList::asset_library() const
{
return *filelist_asset_library(filelist_);
return filelist_asset_library(filelist_);
}
/** \} */
@ -568,7 +568,7 @@ AssetLibrary *ED_assetlist_library_get(const AssetLibraryReference *library_refe
{
AssetList *list = AssetListStorage::lookup_list(*library_reference);
if (list) {
return &list->asset_library();
return list->asset_library();
}
return nullptr;
}