[Bf-blender-cvs] [5d77c3a6a5a] master: Fix T102132: Directory selection fails to add trailing slash
Campbell Barton
noreply at git.blender.org
Sun Oct 30 05:27:48 CET 2022
Commit: 5d77c3a6a5a27094342d942c5eb4db3c8ded1cd1
Author: Campbell Barton
Date: Sun Oct 30 15:24:41 2022 +1100
Branches: master
https://developer.blender.org/rB5d77c3a6a5a27094342d942c5eb4db3c8ded1cd1
Fix T102132: Directory selection fails to add trailing slash
Regression in [0], accessing the path from the file selector relied on
BLI_join_dirfile adding a trailing "/" when the filename was empty.
[0]: 9f6a045e23cf4ab132ef78eeaf070bd53d0c509f
===================================================================
M source/blender/editors/space_file/file_ops.c
===================================================================
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index a4d4bf98474..20025b0bac9 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -1564,7 +1564,13 @@ void file_sfile_to_operator_ex(
PropertyRNA *prop;
/* XXX, not real length */
- BLI_path_join(filepath, FILE_MAX, params->dir, params->file);
+ if (params->file[0]) {
+ BLI_path_join(filepath, FILE_MAX, params->dir, params->file);
+ }
+ else {
+ BLI_strncpy(filepath, params->dir, FILE_MAX - 1);
+ BLI_path_slash_ensure(filepath);
+ }
if ((prop = RNA_struct_find_property(op->ptr, "relative_path"))) {
if (RNA_property_boolean_get(op->ptr, prop)) {
More information about the Bf-blender-cvs
mailing list