blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 351 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 6 Commits 351 Files Changed 124 +5 -18
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c01e9a6637 - Show all commits

6
source/blender/editors/interface/templates/interface_templates.cc
View File

@ -6381,9 +6381,9 @@ static void ui_template_status_info_warnings_messages(Main *bmain,
tooltip_message += "\n\n";
}
tooltip_message += RPT_(
"This file is managed by the Blender asset system.\n"
"By editing it as a regular blend file, it will no longer\n"
"be possible to update its assets through the asset browser.");
"This file is managed by the Blender asset system\n"
"and is expected to contain a single asset data-block.\n"
"Take care to avoid data loss when editing assets.");
}
regular_message = ED_info_statusbar_string_ex(bmain, scene, view_layer, statusbar_info_flag);

17
source/blender/windowmanager/intern/wm_files.cc
View File

@ -4022,10 +4022,8 @@ static void file_overwrite_detailed_info_show(uiLayout *parent_layout, Main *bma
}
uiItemL(layout, RPT_("This file is managed by the Blender asset system."), ICON_NONE);
uiItemL(
layout, RPT_("By overwriting it as a regular blend file, it will no longer"), ICON_NONE);
uiItemL(
layout, RPT_("be possible to update its assets through the asset browser."), ICON_NONE);
uiItemL(layout, RPT_("and is expected to contain a single asset data-block."), ICON_NONE);
uiItemL(layout, RPT_("Take care to avoid data loss when editing assets."), ICON_NONE);
}
}
@ -4096,17 +4094,6 @@ static void save_file_overwrite_saveas(bContext *C, void *arg_block, void * /*ar
wmOperatorType *ot = WM_operatortype_find("WM_OT_save_as_mainfile", false);
WM_operator_properties_create_ptr(&props_ptr, ot);
if (bmain->is_asset_repository) {
/* If needed, substitute the 'proposed' Save As filepath by replacing the `.asset.blend` part
* of it by just `.blend`. */
std::string filepath = BKE_main_blendfile_path(bmain);
if (blender::StringRef(filepath).endswith(BLENDER_ASSET_FILE_SUFFIX)) {
filepath.replace(
filepath.rfind(BLENDER_ASSET_FILE_SUFFIX), strlen(BLENDER_ASSET_FILE_SUFFIX), ".blend");
RNA_string_set(&props_ptr, "filepath", filepath.c_str());
}
}
WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &props_ptr, nullptr);
WM_operator_properties_free(&props_ptr);
}