blender
/
blender
136
411
Fork 595
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 +5 -2
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2ee9cb57fb - Show all commits

1
scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -2189,6 +2189,7 @@ def km_info(params):
# ------------------------------------------------------------------------------
# Editor (File Browser)
def km_file_browser(params):
items = []
keymap = (

3
source/blender/editors/asset/intern/asset_view_catalog_filter.cc
View File

@ -50,7 +50,8 @@ bool asset_view_set_catalog_filter_settings(
}
if (filter_settings->filter_settings.filter_mode == ASSET_CATALOG_SHOW_ASSETS_FROM_CATALOG &&
!BLI_uuid_equal(filter_settings->filter_settings.active_catalog_id, catalog_id)) {
!BLI_uuid_equal(filter_settings->filter_settings.active_catalog_id, catalog_id))
{
filter_settings->filter_settings.active_catalog_id = catalog_id;
needs_update = true;
}

3
source/blender/editors/space_file/filelist.cc
View File

@ -840,7 +840,8 @@ static bool is_filtered_asset(FileListInternEntry *file, FileListFilter *filter)
/* Not used yet for the asset view template. */
if (filter->asset_catalog_filter && !asset_view_is_asset_visible_in_catalog_filter_settings(
filter->asset_catalog_filter, asset_data)) {
filter->asset_catalog_filter, asset_data))
{
return false;
}