blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 358 commits from brush-assets-project into main
pull from: brush-assets-project
merge into: blender:main

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

14
source/blender/editors/sculpt_paint/paint_ops.cc
View File

@ -1072,10 +1072,16 @@ static int brush_asset_save_as_exec(bContext *C, wmOperator *op)
/* Add asset to catalog. */
char catalog_path[MAX_NAME];
RNA_string_get(op->ptr, "catalog_path", catalog_path);
const asset_system::AssetCatalog &catalog = asset_library_ensure_catalogs_in_path(*library,
catalog_path);
const asset_system::CatalogID catalog_id = catalog.catalog_id;
const std::string catalog_simple_name = catalog.simple_name;
std::optional<asset_system::CatalogID> catalog_id;
std::optional<StringRefNull> catalog_simple_name;
if (catalog_path[0]) {
const asset_system::AssetCatalog &catalog = asset_library_ensure_catalogs_in_path(
*library, catalog_path);
catalog_id = catalog.catalog_id;
catalog_simple_name = catalog.simple_name;
}
library->catalog_service().write_to_disk(filepath);