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

[Peter Schlaile]

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

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

Fix for the transform fix. It's getting late...

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:28:12 UTC (rev 18872)
+++ trunk/blender/source/blender/src/seqeffects.c	2009-02-08 19:54:11 UTC (rev 18873)
@@ -2007,8 +2007,10 @@
 
 	//Factor translate
 	if(!scale->percent){
-		tx = scale->xIni+(xo / 2.0f) + (scale->xFin-(xo / 2.0f) - scale->xIni+(xo / 2.0f)) * facf0;
-		ty = scale->yIni+(yo / 2.0f) + (scale->yFin-(yo / 2.0f) - scale->yIni+(yo / 2.0f)) * facf0;
+		float rd_s = (rd->size / 100.0f);
+
+		tx = scale->xIni * rd_s+(xo / 2.0f) + (scale->xFin * rd_s -(xo / 2.0f) - scale->xIni * rd_s +(xo / 2.0f)) * facf0;
+		ty = scale->yIni * rd_s+(yo / 2.0f) + (scale->yFin * rd_s -(yo / 2.0f) - scale->yIni * rd_s +(yo / 2.0f)) * facf0;
 	}else{
 		tx = xo*(scale->xIni/100.0f)+(xo / 2.0f) + (xo*(scale->xFin/100.0f)-(xo / 2.0f) - xo*(scale->xIni/100.0f)+(xo / 2.0f)) * facf0;
 		ty = yo*(scale->yIni/100.0f)+(yo / 2.0f) + (yo*(scale->yFin/100.0f)-(yo / 2.0f) - yo*(scale->yIni/100.0f)+(yo / 2.0f)) * facf0;
@@ -2020,8 +2022,6 @@
 	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++) {