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-09-26 14:39:36 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-09-26 14:39:36 +0400
commit6db84f85dcf0a398490cc1162495ac3d2e0ca826 (patch)
treeff8d834159f5d30071548208038c52aa182d97a2 /source/blender/blenkernel/intern/sequencer.c
parenta88bc390d0ff976075aa18356a698da7c54c50b9 (diff)
Fix #32091: Crop and offset coordinates changes proxy render settings on image strips
Made offset and crop working in final resolution space, meaning that visual result would be the same when using different proxy resolution in sequencer preview and different resolution percentage when rendering. It could break some files designed to with render percentage not equal to 100% using wrong image crop and offset values. But this would also make it easier to setup scene and render it with different percentage (useful for preview renders for example)
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 945115c0bf6..bb845400cef 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1835,8 +1835,6 @@ 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);
@@ -1853,14 +1851,6 @@ static ImBuf *input_preprocess(SeqRenderData context, Sequence *seq, float cfra,
t = *seq->strip->transform;
}
- xscale = context.scene->r.xsch ? ((double) context.rectx / (double) context.scene->r.xsch) : 1.0;
- yscale = context.scene->r.ysch ? ((double) context.recty / (double) context.scene->r.ysch) : 1.0;
-
- 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;