[Bf-blender-cvs] [264e830] gooseberry: bring back no scaling for proxies

[Antony Riakiotakis]

Commit: 264e830a7d253bd0a7dc74379b3c9c448f156c72
Author: Antony Riakiotakis
Date:   Fri Feb 6 16:41:27 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB264e830a7d253bd0a7dc74379b3c9c448f156c72

bring back no scaling for proxies

===================================================================

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
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs