[Bf-blender-cvs] [7039808] master: Fix T45251 custom directory not taken into account for image proxies.
Antony Riakiotakis
noreply at git.blender.org
Tue Jun 30 16:31:42 CEST 2015
Commit: 703980889977c65fc34ca6aee8633a714fe0918b
Author: Antony Riakiotakis
Date: Tue Jun 30 16:31:14 2015 +0200
Branches: master
https://developer.blender.org/rB703980889977c65fc34ca6aee8633a714fe0918b
Fix T45251 custom directory not taken into account for image proxies.
===================================================================
M source/blender/blenkernel/intern/sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 4ec5dd5..19124dd 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;
More information about the Bf-blender-cvs
mailing list