diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-30 17:31:14 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-30 17:31:30 +0300 |
| commit | 703980889977c65fc34ca6aee8633a714fe0918b (patch) | |
| tree | 9670bdad7b2bb7c721f39379f2ca112b5003834d /source/blender/blenkernel/intern/sequencer.c | |
| parent | 72d21fbd346a5afd102882a56214ba773a15b88d (diff) | |
Fix T45251 custom directory not taken into account for image proxies.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 4ec5dd58973..19124ddc549 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; |