From a8355471b92fee025cfa3785c8ea45ef3f3badef Mon Sep 17 00:00:00 2001
From: Antony Riakiotakis <kalast@gmail.com>
Date: Tue, 30 Jun 2015 16:31:14 +0200
Subject: [PATCH] Fix T45251 custom directory not taken into account for image
proxies.
---
source/blender/blenkernel/intern/sequencer.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index d4d64af6c94..b4eba711f22 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1608,7 +1608,10 @@ static bool seq_proxy_get_fname(Editing *ed, Sequence *seq, int cfra, int render
BLI_path_append(dir, sizeof(dir), fname);
}
else if (seq->type == SEQ_TYPE_IMAGE) {
- BLI_snprintf(dir, PROXY_MAXFILE, "%s/BL_proxy", seq->strip->dir);
+ if (proxy->storage & SEQ_STORAGE_PROXY_CUSTOM_DIR)
+ BLI_strncpy(dir, seq->strip->proxy->dir, sizeof(dir));
+ else
+ BLI_snprintf(dir, PROXY_MAXFILE, "%s/BL_proxy", seq->strip->dir);
}
else {
return false;
--
GitLab