tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge remote-tracking branch 'origin/blender-v3.0-release'

This commit is contained in:
Sybren A. Stüvel 2021-11-23 13:02:25 +01:00
parent f392ce50c4 3e65bb86f9
commit cf299bee80
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/asset/intern/asset_ops.cc
View File

@ -750,7 +750,7 @@ static int asset_bundle_install_exec(bContext *C, wmOperator *op)
BLI_assert_msg(lib, "If the asset library is not known, how did we get here?");
BKE_reportf(op->reports,
RPT_INFO,
"Saved \"%s\" to asset library \"%s\"",
R"(Saved "%s" to asset library "%s")",
BLI_path_basename(bmain->name),
lib->name);
return OPERATOR_FINISHED;
@ -837,7 +837,7 @@ static bool set_filepath_for_asset_lib(const Main *bmain, struct wmOperator *op)
/* Concatenate the filename of the current blend file. */
const char *blend_filename = BLI_path_basename(bmain->name);
if (blend_filename == NULL || blend_filename[0] == '\0') {
if (blend_filename == nullptr || blend_filename[0] == '\0') {
return false;
}