diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-17 12:17:46 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-17 12:17:46 +0400 |
| commit | 781b4cafbd22101eb7ced4e2db1c485eafb53e81 (patch) | |
| tree | 0d05483b8a1f2cabd54128c2e6ee89d80a2b54a5 | |
| parent | b83577aaec35270552e392b8d299e659b147fda3 (diff) | |
Camera tracking: fixed incorrect auto-scale calculation for 2d stabilization
--
svn merge -r44146:44147 ^/branches/soc-2011-tomato
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 695ea1dc07a..f089aae578b 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -2445,8 +2445,8 @@ static void calculate_stabdata(MovieTracking *tracking, int framenr, float width *scale= (stab->scale-1.0f)*stab->scaleinf+1.0f; *angle= 0.0f; - loc[0]= (firstmedian[0]-median[0])*width*(*scale); - loc[1]= (firstmedian[1]-median[1])*height*(*scale); + loc[0]= (firstmedian[0]-median[0])*width; + loc[1]= (firstmedian[1]-median[1])*height; mul_v2_fl(loc, stab->locinf); @@ -2725,7 +2725,7 @@ void BKE_tracking_stabdata_to_mat4(int width, int height, float loc[2], float sc invert_m4_m4(icmat, cmat); size_to_mat4(smat, svec); /* scale matrix */ - add_v2_v2(lmat[3], loc); /* tranlation matrix */ + add_v2_v2(lmat[3], loc); /* translation matrix */ rotate_m4(rmat, 'Z', angle); /* rotation matrix */ /* compose transformation matrix */ |