[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50901] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: Fix #32091: Crop and offset coordinates changes proxy render settings on image strips

Sergey Sharybin sergey.vfx at gmail.com
Wed Sep 26 12:39:36 CEST 2012


Revision: 50901
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50901
Author:   nazgul
Date:     2012-09-26 10:39:36 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-26 10:39:32 UTC (rev 50900)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-26 10:39:36 UTC (rev 50901)
@@ -1835,8 +1835,6 @@
 		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 @@
 			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;




More information about the Bf-blender-cvs mailing list