Commit: 0a02c15dbce5e3d70131dc9a6e497a63f4d47930
Author: Antony Riakiotakis
Date: Fri Feb 6 15:58:39 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB0a02c15dbce5e3d70131dc9a6e497a63f4d47930
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 51e58e3..90ae0cb 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);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
