[Bf-blender-cvs] [bf54867] master: Get rid of no scaling for proxies for master, it causes FX to crash, will code another workaround for gooseberry.

[Antony Riakiotakis]

Commit: bf54867ff1b5d627906fdc19e8d00b7842935f54
Author: Antony Riakiotakis
Date:   Fri Feb 6 15:58:39 2015 +0100
Branches: master
https://developer.blender.org/rBbf54867ff1b5d627906fdc19e8d00b7842935f54

Get rid of no scaling for proxies for master, it causes FX to crash,
will code another workaround for gooseberry.

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

M	source/blender/blenkernel/intern/sequencer.c

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 7a284a8..83287fe 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);
 		}
 	}