diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-06 18:44:03 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-06 18:44:03 +0300 |
| commit | 3de0722234320953f7d7ea17846d8203c0558300 (patch) | |
| tree | af5c6c0a57b6eece474b37ead3c500658dfb0fc4 /source/blender/blenkernel/intern/sequencer.c | |
| parent | 264e830a7d253bd0a7dc74379b3c9c448f156c72 (diff) | |
| parent | 14dbe1c2611bcb550702762004e0fc34161c68f1 (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 51e58e39fa6..90ae0cbdd32 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2164,14 +2164,12 @@ static ImBuf *input_preprocess(const SeqRenderData *context, Sequence *seq, floa multibuf(ibuf, mul); } - if (!is_proxy_image) { - if (ibuf->x != context->rectx || ibuf->y != context->recty) { - if (scene->r.mode & R_OSA) { - IMB_scaleImBuf(ibuf, (short)context->rectx, (short)context->recty); - } - else { - IMB_scalefastImBuf(ibuf, (short)context->rectx, (short)context->recty); - } + if (ibuf->x != context->rectx || ibuf->y != context->recty) { + if (scene->r.mode & R_OSA) { + IMB_scaleImBuf(ibuf, (short)context->rectx, (short)context->recty); + } + else { + IMB_scalefastImBuf(ibuf, (short)context->rectx, (short)context->recty); } } |