[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44762] trunk/blender/source/blender: Some fixes for 2D stabilization:

[Sergey Sharybin]

Revision: 44762
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44762
Author:   nazgul
Date:     2012-03-09 10:01:29 +0000 (Fri, 09 Mar 2012)
Log Message:
-----------
Some fixes for 2D stabilization:
- Ron aspect ratio correction after applying location
  There're still some annoynments with rotation stabilization with
  pixel aspect != 1, will be fixed later.
- Joining tracks will update track used for rotation stabilization/

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/tracking.c
    trunk/blender/source/blender/editors/space_clip/tracking_ops.c

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c   2012-03-09 
09:30:03 UTC (rev 44761)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c   2012-03-09 
10:01:29 UTC (rev 44762)
@@ -2749,7 +2749,7 @@
        rotate_m4(rmat, 'Z', angle);    /* rotation matrix */
 
        /* compose transformation matrix */
-       mul_serie_m4(mat, amat, lmat, cmat, rmat, smat, icmat, iamat, NULL);
+       mul_serie_m4(mat, lmat, cmat, amat, rmat, iamat, smat, icmat, NULL);
 }
 
 MovieDistortion *BKE_tracking_distortion_create(void)

Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c      
2012-03-09 09:30:03 UTC (rev 44761)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c      
2012-03-09 10:01:29 UTC (rev 44762)
@@ -1170,7 +1170,7 @@
 
        /* identifiers */
        ot->name= "Select Grouped";
-       ot->description= "Joint Selected Tracks";
+       ot->description= "Select all tracks from specified group";
        ot->idname= "CLIP_OT_select_grouped";
 
        /* api callbacks */
@@ -2974,6 +2974,9 @@
                if(TRACK_VIEW_SELECTED(sc, track) && track!=act_track) {
                        BKE_tracking_join_tracks(act_track, track);
 
+                       if(tracking->stabilization.rot_track == track)
+                               tracking->stabilization.rot_track= act_track;
+
                        BKE_tracking_free_track(track);
                        BLI_freelinkN(tracksbase, track);
                }

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