diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-11 14:32:27 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-11 14:32:27 +0400 |
| commit | 0682c3f1aefe315df5fe64ba8c814adacbd739e5 (patch) | |
| tree | 9b82ead6ee76b0d6d71496fdb860e4a9e7546616 /source/blender/blenkernel/intern/sequencer.c | |
| parent | fdc5e4f5a6207a7cefb0fd9c58438dd79553ebfb (diff) | |
Code cleanup and minor change to CMake's colalda detection to make
it detect directory structure used for libs in our svn (<root>/include/<component>/include)
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 419abb7b27a..4f1b324bc28 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1128,15 +1128,13 @@ static int seq_proxy_get_fname(Sequence *seq, int cfra, int render_size, char *n /* generate a separate proxy directory for each preview size */ if (seq->type == SEQ_TYPE_IMAGE) { - BLI_snprintf(name, PROXY_MAXFILE, "%s/images/%d/%s_proxy", dir, - render_size, + BLI_snprintf(name, PROXY_MAXFILE, "%s/images/%d/%s_proxy", dir, render_size, BKE_sequencer_give_stripelem(seq, cfra)->name); frameno = 1; } else { frameno = (int)give_stripelem_index(seq, cfra) + seq->anim_startofs; - BLI_snprintf(name, PROXY_MAXFILE, "%s/proxy_misc/%d/####", dir, - render_size); + BLI_snprintf(name, PROXY_MAXFILE, "%s/proxy_misc/%d/####", dir, render_size); } BLI_path_abs(name, G.main->name); @@ -1185,11 +1183,9 @@ static ImBuf *seq_proxy_fetch(SeqRenderData context, Sequence *seq, int cfra) seq_open_anim_file(seq); - frameno = IMB_anim_index_get_frame_index(seq->anim, seq->strip->proxy->tc, - frameno); + frameno = IMB_anim_index_get_frame_index(seq->anim, seq->strip->proxy->tc, frameno); - return IMB_anim_absolute(seq->strip->proxy->anim, frameno, - IMB_TC_NONE, IMB_PROXY_NONE); + return IMB_anim_absolute(seq->strip->proxy->anim, frameno, IMB_TC_NONE, IMB_PROXY_NONE); } if (seq_proxy_get_fname(seq, cfra, render_size, name) == 0) { |