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:
authorPeter Schlaile <peter@schlaile.de>2009-02-08 22:54:11 +0300
committerPeter Schlaile <peter@schlaile.de>2009-02-08 22:54:11 +0300
commitecf5250cf39db6093b8069f710bda9adae1fbd8b (patch)
tree2c31116c292887a1cd3249ef049585f711af056c
parent7877fb2f83e58d2bc828a1cdc34148b8939703a3 (diff)
== Sequencer ==
Fix for the transform fix. It's getting late...
-rw-r--r--source/blender/src/seqeffects.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/seqeffects.c b/source/blender/src/seqeffects.c
index a72feeb60c4..6b25499fe6b 100644
--- a/source/blender/src/seqeffects.c
+++ b/source/blender/src/seqeffects.c
@@ -2007,8 +2007,10 @@ static void do_transform(Sequence * seq,float facf0, int x, int y,
//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 @@ static void do_transform(Sequence * seq,float facf0, int x, int y,
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++) {