diff options
author | Bastien Montagne <bastien@blender.org> | 2022-05-17 18:34:51 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-05-17 18:34:51 +0300 |
commit | b3b5d4cabb9653b9e5ddb9650378da4dc4aaac20 (patch) | |
tree | 818b8472686e1e142b4bb6530fd112f34b61febc /source/blender/blenloader | |
parent | 8c9805fc628223984ad0c664b5a49b7f9eec0caa (diff) | |
parent | 83349294b12f904bc1295c53e0242ea92c593c93 (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 080ec50e0fb..65c42545a77 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1357,7 +1357,6 @@ bool BLO_write_file(Main *mainvar, /* Remapping of relative paths to new file location. */ if (remap_mode != BLO_WRITE_PATH_REMAP_NONE) { - if (remap_mode == BLO_WRITE_PATH_REMAP_RELATIVE) { /* Make all relative as none of the existing paths can be relative in an unsaved document. */ if (relbase_valid == false) { @@ -1396,6 +1395,13 @@ bool BLO_write_file(Main *mainvar, } if (remap_mode != BLO_WRITE_PATH_REMAP_NONE) { + /* Some path processing (e.g. with libraries) may use the current `main->filepath`, if this + * is not matching the path currently used for saving, unexpected paths corruptions can + * happen. See T98201. */ + char mainvar_filepath_orig[FILE_MAX]; + STRNCPY(mainvar_filepath_orig, mainvar->filepath); + STRNCPY(mainvar->filepath, filepath); + /* Check if we need to backup and restore paths. */ if (UNLIKELY(use_save_as_copy)) { path_list_backup = BKE_bpath_list_backup(mainvar, path_list_flag); @@ -1420,6 +1426,8 @@ bool BLO_write_file(Main *mainvar, BLI_assert_unreachable(); /* Unreachable. */ break; } + + STRNCPY(mainvar->filepath, mainvar_filepath_orig); } } |