Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #33295: Shifted movie strip when rendering <100% resolution for strip with complex transform

Browse Source 
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.
This commit is contained in:
Sergey Sharybin
2012-11-28 09:01:00 +00:00
parent 0b9be70591
commit 2eb21ef30c
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/sequencer.c
View File

@@ -1835,6 +1835,8 @@ static ImBuf *input_preprocess(SeqRenderData context, Sequence *seq, float cfra,
StripCrop c = {0}; StripCrop c = {0};
StripTransform t = {0}; StripTransform t = {0};
int sx, sy, dx, dy; int sx, sy, dx, dy;
double xscale = 1.0;
double yscale = 1.0;
if (is_proxy_image) { if (is_proxy_image) {
double f = seq_rendersize_to_scale_factor(context.preview_render_size); 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; 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; sx = ibuf->x - c.left - c.right;
sy = ibuf->y - c.top - c.bottom; sy = ibuf->y - c.top - c.bottom;
dx = sx; dx = sx;