diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-06 17:58:39 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-06 17:58:50 +0300 |
| commit | bf54867ff1b5d627906fdc19e8d00b7842935f54 (patch) | |
| tree | 67d668807ba66a871d8a1cba220e3dbe0859b69c /source/blender/blenkernel | |
| parent | dffdde4cdce3921a79f0e4320a1f7c2c06917bcd (diff) | |
Get rid of no scaling for proxies for master, it causes FX to crash,
will code another workaround for gooseberry.
Diffstat (limited to 'source/blender/blenkernel')
| -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 7a284a8fe58..83287fe7725 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2137,14 +2137,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); } } |