Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2021-11-23 15:02:25 +0300
committerSybren A. Stüvel <sybren@blender.org>2021-11-23 15:02:25 +0300
commitcf299bee8089e1dc0ee35a89b831532073588f7b (patch)
tree4973ce2f989ee07d5c96093b2d948d5fa3bf7d64 /source/blender/editors/asset
parentf392ce50c476ebe0118dce2e6475617c454fc9a7 (diff)
parent3e65bb86f92339181a2a30e8ccff6b923a04b0e8 (diff)
Merge remote-tracking branch 'origin/blender-v3.0-release'
Diffstat (limited to 'source/blender/editors/asset')
-rw-r--r--source/blender/editors/asset/intern/asset_ops.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc
index 5e4fab6a14f..a228b275558 100644
--- a/source/blender/editors/asset/intern/asset_ops.cc
+++ b/source/blender/editors/asset/intern/asset_ops.cc
@@ -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;
}