blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 774 Projects 19 Wiki Activity

UI: Asset Shelf (Experimental Feature) #104831

Closed
Julian Eisel wants to merge 399 commits from asset-shelf into main
pull from: asset-shelf
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 30 Commits 399 Files Changed - +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 2a7571fa41 - Show all commits

8
source/blender/asset_system/intern/asset_library_service.cc
View File

@ -308,7 +308,7 @@ std::optional<AssetLibraryService::ExplodedPath> AssetLibraryService::
resolve_asset_weak_reference_to_exploded_path(const AssetWeakReference &asset_reference)
{
if (asset_reference.relative_asset_identifier[0] == '\0') {
return {};
return std::nullopt;
}
switch (eAssetLibraryType(asset_reference.asset_library_type)) {
@ -328,7 +328,7 @@ std::optional<AssetLibraryService::ExplodedPath> AssetLibraryService::
std::string full_path = resolve_asset_weak_reference_to_full_path(asset_reference);
if (full_path.empty()) {
return {};
return std::nullopt;
}
const std::vector<std::string> blendfile_extensions = {".blend/", ".blend.gz/", ".ble/"};
@ -361,10 +361,10 @@ std::optional<AssetLibraryService::ExplodedPath> AssetLibraryService::
return exploded;
}
case ASSET_LIBRARY_ALL:
return {};
return std::nullopt;
}
return {};
return std::nullopt;
}
bUserAssetLibrary *AssetLibraryService::find_custom_asset_library_from_library_ref(