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:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-02-16 17:14:28 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-02-16 17:14:28 +0400
commitfedb95da234ea30adab246606533caa6a5e38e4f (patch)
treedbe28e73c4c0fb1fbd7cde32f6617508ea74aded
parentda69173269b73209a484fde69c9ddbb6d42a287d (diff)
Tomato: fixed incorrect auto-scale calculation for 2d stabilization
-rw-r--r--source/blender/blenkernel/intern/tracking.c6
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 */