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:
authorPhilipp Oeser <info@graphics-engineer.com>2020-08-11 15:31:21 +0300
committerJeroen Bakker <jeroen@blender.org>2020-08-12 10:38:39 +0300
commit5d42024be6765bfd2f7dfe69dab97c7101e28dae (patch)
treec3a2f7ab36bb278c2362b5e387571a378ba5d169
parentfa2a13bcb958ee038ab85c4a413282accceedd1f (diff)
Fix T79676: Video Sequencer image sequence strip source path breaks when
saving with 'Remap Relative' option Caused by rBf7386b97571e. Logic in BKE_bpath_traverse_main calls the callback multiple times [as often as there are images in the strip]. Prior to above commit, the callback was 'bpath_relative_convert_visit_cb' [this one did not have this problem - since it returned early if the path was already made relative once] After rBf7386b97571e though, the 'bpath_relative_rebase_visit_cb' is used [this one should not be entered multiple times, it would modifiy the directy again and again]. Luckily, we have a flag (BKE_BPATH_TRAVERSE_SKIP_MULTIFILE) that can be used to prevent this (this will take care of only calling the callback once in BKE_bpath_traverse_main for the VSE case) Could be backported to 2.83 I think. Maniphest Tasks: T79676 Differential Revision: https://developer.blender.org/D8536
-rw-r--r--source/blender/blenkernel/intern/bpath.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c
index d179bfbedfd..23708f15781 100644
--- a/source/blender/blenkernel/intern/bpath.c
+++ b/source/blender/blenkernel/intern/bpath.c
@@ -167,7 +167,7 @@ void BKE_bpath_relative_rebase(Main *bmain,
ReportList *reports)
{
BPathRebase_Data data = {NULL};
- const int flag = BKE_BPATH_TRAVERSE_SKIP_LIBRARY;
+ const int flag = (BKE_BPATH_TRAVERSE_SKIP_LIBRARY | BKE_BPATH_TRAVERSE_SKIP_MULTIFILE);
BLI_assert(basedir_src[0] != '\0');
BLI_assert(basedir_dst[0] != '\0');