diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-21 12:30:50 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-21 12:30:50 +0300 |
| commit | 78ceb4b51ed92ba2a1aca5bbca9dacea00b6b51a (patch) | |
| tree | 96ee47fb85612cc3aed56559cf4123f9ef600b58 /source/blender/blenkernel/intern/sequencer.c | |
| parent | 813204838a268fd8108e9f9bc96bb1b4680c7929 (diff) | |
| parent | b1946e7f7ad2c9a308060f4f1a06f82cdcb4c8a5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 424f4269f3c..950f7ad9957 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1680,6 +1680,11 @@ static bool seq_proxy_get_fname(Editing *ed, Sequence *seq, int cfra, int render else if (seq->type == SEQ_TYPE_IMAGE) { fname[0] = 0; } + else { + /* We could make a name here, except non-movie's don't generate proxies, + * cancel until other types of sequence strips are supported. */ + return false; + } BLI_path_append(dir, sizeof(dir), fname); BLI_path_abs(name, G.main->name); } |