diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-30 17:31:14 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-30 23:41:06 +0300 |
| commit | a8355471b92fee025cfa3785c8ea45ef3f3badef (patch) | |
| tree | 991a38605c2ec0cfb27dd8b539e6cb4a6c9a4289 | |
| parent | 1e303217b983914a6d6c01e72f174cf6af8d3d61 (diff) | |
Fix T45251 custom directory not taken into account for image proxies.
| -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 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; |