[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18872] trunk/blender/source/blender/src/ seqeffects.c: == Sequencer ==

[Peter Schlaile]

Revision: 18872
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18872
Author:   schlaile
Date:     2009-02-08 20:28:12 +0100 (Sun, 08 Feb 2009)

Log Message:
-----------
== Sequencer ==

Fixed proxy scale problems in transform effect

Modified Paths:
--------------
    trunk/blender/source/blender/src/seqeffects.c

Modified: trunk/blender/source/blender/src/seqeffects.c
===================================================================
--- trunk/blender/source/blender/src/seqeffects.c	2009-02-08 19:15:59 UTC (rev 18871)
+++ trunk/blender/source/blender/src/seqeffects.c	2009-02-08 19:28:12 UTC (rev 18872)
@@ -924,18 +924,18 @@
 
 static void do_gammacross_effect_byte(float facf0, float facf1, 
 				      int x, int y, 
-				      char *rect1, 
-				      char *rect2, 
-				      char *out)
+				      unsigned char *rect1, 
+				      unsigned char *rect2, 
+				      unsigned char *out)
 {
 	int fac1, fac2, col;
 	int xo;
-	char *rt1, *rt2, *rt;
+	unsigned char *rt1, *rt2, *rt;
 	
 	xo= x;
-	rt1= (char *)rect1;
-	rt2= (char *)rect2;
-	rt= (char *)out;
+	rt1= (unsigned char *)rect1;
+	rt2= (unsigned char *)rect2;
+	rt= (unsigned char *)out;
 
 	fac2= (int)(256.0*facf0);
 	fac1= 256-fac2;
@@ -1994,6 +1994,9 @@
 	float xs,ys,factxScale,factyScale,tx,ty,rad,s,c,xaux,yaux,factRot,px,py;
 	TransformVars *scale;
 	
+	struct RenderData *rd = &G.scene->r;
+
+
 	scale = (TransformVars *)seq->effectdata;
 	xo = x;
 	yo = y;
@@ -2017,6 +2020,9 @@
 	s= sin(rad);
 	c= cos(rad);
 
+	tx *= (rd->size / 100.0f);
+	ty *= (rd->size / 100.0f);
+
 	for (yi = 0; yi < yo; yi++) {
 		for (xi = 0; xi < xo; xi++) {
 			//tranlate point