From eb1b38f31a96d029caa4672c66608adcdc646048 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 9 Mar 2012 10:01:29 +0000 Subject: 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/ --- source/blender/blenkernel/intern/tracking.c | 2 +- source/blender/editors/space_clip/tracking_ops.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index c4f11deda0b..5a7a11cd0cc 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -2749,7 +2749,7 @@ void BKE_tracking_stabdata_to_mat4(int width, int height, float aspect, float lo 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) diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index a4592e9fc25..b4990180b19 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1170,7 +1170,7 @@ void CLIP_OT_select_grouped(wmOperatorType *ot) /* 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 @@ static int join_tracks_exec(bContext *C, wmOperator *op) 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); } -- cgit v1.2.3