diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-07 13:15:02 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-07 13:15:18 +0300 |
| commit | 34818a44b282f44e22205507dabee1e37c6312ab (patch) | |
| tree | 9aea8f6337947d2bd6b2e46b1d7f503ba01e1132 | |
| parent | 20a780e3e88948a0f0a4e552359c8ff915a369a8 (diff) | |
Make image strips also follow the project directory storage options.
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 8c803f86979..4cea8aa0b85 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1581,13 +1581,19 @@ static bool seq_proxy_get_fname(Editing *ed, Sequence *seq, int cfra, int render sanim = BLI_findlink(&seq->anims, view_id); - if (sanim && sanim->anim && ed->proxy_storage == SEQ_EDIT_PROXY_DIR_STORAGE) { + if (ed->proxy_storage == SEQ_EDIT_PROXY_DIR_STORAGE) { char fname[FILE_MAXFILE]; if (ed->proxy_dir[0] == 0) BLI_strncpy(dir, "//BL_proxy", sizeof(dir)); else BLI_strncpy(dir, ed->proxy_dir, sizeof(dir)); - IMB_anim_get_fname(sanim->anim, fname, FILE_MAXFILE); + + if (sanim && sanim->anim) { + IMB_anim_get_fname(sanim->anim, fname, FILE_MAXFILE); + } + else if (seq->type == SEQ_TYPE_IMAGE) { + fname[0] = 0; + } BLI_path_append(dir, sizeof(dir), fname); BLI_path_abs(name, G.main->name); } |