Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-11-28 13:01:00 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-11-28 13:01:00 +0400
commit2eb21ef30c37fb1ac6ab3c6485f0e65daa7a8fdf (patch)
tree61faf9737a54a0d479995f1d20881c976085de73 /source/blender/blenkernel/intern/sequencer.c
parent0b9be7059183fd7b4e8b567aeab5fec0cab1f999 (diff)
Fix #33295: Shifted movie strip when rendering <100% resolution for strip with complex transform
That was kind of a regression since fix for #32091: Crop and offset coordinates changes proxy render settings on image strips, which is now fixed in other way. Namely Offset/Crop values are filling in 100% scene resolution values, but getting scaled to proxy / scene percentage values.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index e023a3e20ae..1c94d18fc05 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1835,6 +1835,8 @@ static ImBuf *input_preprocess(SeqRenderData context, Sequence *seq, float cfra,
StripCrop c = {0};
StripTransform t = {0};
int sx, sy, dx, dy;
+ double xscale = 1.0;
+ double yscale = 1.0;
if (is_proxy_image) {
double f = seq_rendersize_to_scale_factor(context.preview_render_size);
@@ -1851,6 +1853,17 @@ static ImBuf *input_preprocess(SeqRenderData context, Sequence *seq, float cfra,
t = *seq->strip->transform;
}
+ xscale = context.scene->r.xsch ? ((float) context.rectx / (float) context.scene->r.xsch) : 1.0;
+ yscale = context.scene->r.ysch ? ((float) context.recty / (float) context.scene->r.ysch) : 1.0;
+
+ xscale /= (float) context.rectx / ibuf->x;
+ yscale /= (float) context.recty / ibuf->y;
+
+ c.left *= xscale; c.right *= xscale;
+ c.top *= yscale; c.bottom *= yscale;
+
+ t.xofs *= xscale; t.yofs *= yscale;
+
sx = ibuf->x - c.left - c.right;
sy = ibuf->y - c.top - c.bottom;
dx = sx;