Commit: 6794e4a8bff88eb69ac3e7c591af1cd7da9ad555
Author: Antony Riakiotakis
Date: Fri Feb 6 16:45:03 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB6794e4a8bff88eb69ac3e7c591af1cd7da9ad555
Bring back yet again no scaling for proxies (squashing to a merge commit is bad)
===================================================================
M source/blender/blenkernel/intern/sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index 90ae0cb..51e58e3 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2164,12 +2164,14 @@ static ImBuf *input_preprocess(const SeqRenderData
*context, Sequence *seq, floa
multibuf(ibuf, mul);
}
- 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 (!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);
+ }
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
