griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Campbell Barton
2025-10-15 18:10:57 +11:00
parent 37eea23c2a 7bc7b7743b
commit 8cb4e466f4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/space_file/file_ops.cc
View File

@@ -1597,19 +1597,23 @@ void file_sfile_to_operator_ex(
{
FileSelectParams *params = ED_fileselect_get_active_params(sfile);
PropertyRNA *prop;
char dir[FILE_MAX];
BLI_strncpy(dir, params->dir, FILE_MAX);
BLI_path_slash_ensure(dir, FILE_MAX);
/* XXX, not real length */
if (params->file[0]) {
BLI_path_join(filepath, FILE_MAX, params->dir, params->file);
}
else {
BLI_strncpy(filepath, params->dir, FILE_MAX);
BLI_path_slash_ensure(filepath, FILE_MAX);
BLI_strncpy(filepath, dir, FILE_MAX);
}
if ((prop = RNA_struct_find_property(op->ptr, "relative_path"))) {
if (RNA_property_boolean_get(op->ptr, prop)) {
BLI_path_rel(filepath, BKE_main_blendfile_path(bmain));
BLI_path_rel(dir, BKE_main_blendfile_path(bmain));
}
}
@@ -1623,8 +1627,8 @@ void file_sfile_to_operator_ex(
}
if ((prop = RNA_struct_find_property(op->ptr, "directory"))) {
RNA_property_string_get(op->ptr, prop, value);
RNA_property_string_set(op->ptr, prop, params->dir);
if (RNA_property_update_check(prop) && !STREQ(params->dir, value)) {
RNA_property_string_set(op->ptr, prop, dir);
if (RNA_property_update_check(prop) && !STREQ(dir, value)) {
RNA_property_update(C, op->ptr, prop);
}
}