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

Fix T45251 custom directory not taken into account for image proxies.

Browse Source
This commit is contained in:
Antony Riakiotakis
2015-06-30 16:31:14 +02:00
parent 72d21fbd34
commit 7039808899
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/sequencer.c
View File

@@ -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;