blender
/
blender
134
400
Fork 584
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

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

This commit is contained in:
Antonis Ryakiotakis 2015-06-30 16:31:14 +02:00
parent 72d21fbd34
commit 7039808899
Notes: blender-bot 2023-02-14 08:56:53 +01:00 
Referenced by issue #45251, Changing custom proxy directory for per-strip proxies fails
1 changed files with 4 additions and 1 deletions
Show Stats 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;