diff options
author | Peter Schlaile <peter@schlaile.de> | 2009-02-08 22:28:12 +0300 |
---|---|---|
committer | Peter Schlaile <peter@schlaile.de> | 2009-02-08 22:28:12 +0300 |
commit | 7877fb2f83e58d2bc828a1cdc34148b8939703a3 (patch) | |
tree | a8310d53bbb8d99f3033adcaf65fdfeebbc4017b /source | |
parent | 270b724b8d653e75827a10bd236d82325ce700d3 (diff) |
== Sequencer ==
Fixed proxy scale problems in transform effect
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/src/seqeffects.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/source/blender/src/seqeffects.c b/source/blender/src/seqeffects.c index 58554fbfeba..a72feeb60c4 100644 --- a/source/blender/src/seqeffects.c +++ b/source/blender/src/seqeffects.c @@ -924,18 +924,18 @@ static void free_gammacross(Sequence * seq) 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 @@ static void do_transform(Sequence * seq,float facf0, int x, int y, 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 @@ 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++) { //tranlate point |