[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44147] branches/soc-2011-tomato/source/ blender/blenkernel/intern/tracking.c: Tomato: fixed incorrect auto-scale calculation for 2d stabilization

[Sergey Sharybin]

Revision: 44147
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44147
Author:   nazgul
Date:     2012-02-16 13:14:28 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Tomato: fixed incorrect auto-scale calculation for 2d stabilization

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c        
2012-02-16 12:19:02 UTC (rev 44146)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c        
2012-02-16 13:14:28 UTC (rev 44147)
@@ -2445,8 +2445,8 @@
        *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 @@
        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 */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs