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 357 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 357 Files Changed 123 +6 -5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c5f3dd13fa - Show all commits

4
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"
"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");
"be possible to update its assets through the asset browser.");
}
regular_message = ED_info_statusbar_string_ex(bmain, scene, view_layer, statusbar_info_flag);

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

@ -4021,10 +4021,11 @@ static void file_overwrite_detailed_info_show(uiLayout *parent_layout, Main *bma
uiItemS_ex(layout, 1.4f);
}
uiItemL(layout, RPT_("This file is managed by the Blender asset system"), ICON_NONE);
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);
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);
}
}