From 02a164baaa57ab037419fde864e02d6a432e858d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 21 Nov 2011 20:43:25 +0000 Subject: Camera tracking: code cleanup --- source/blender/blenkernel/intern/tracking.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 0e4e8f737da..0c395931212 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -231,9 +231,12 @@ MovieTrackingTrack *BKE_tracking_add_track(MovieTracking *tracking, float x, flo void BKE_tracking_insert_marker(MovieTrackingTrack *track, MovieTrackingMarker *marker) { - MovieTrackingMarker *old_marker= BKE_tracking_get_marker(track, marker->framenr); + MovieTrackingMarker *old_marker= NULL; - if(old_marker && old_marker->framenr==marker->framenr) { + if(track->markersnr) + old_marker= BKE_tracking_exact_marker(track, marker->framenr); + + if(old_marker) { *old_marker= *marker; } else { int a= track->markersnr; @@ -324,7 +327,7 @@ MovieTrackingMarker *BKE_tracking_ensure_marker(MovieTrackingTrack *track, int f { MovieTrackingMarker *marker= BKE_tracking_get_marker(track, framenr); - if(marker && marker->framenr!=framenr) { + if(marker->framenr!=framenr) { MovieTrackingMarker marker_new; marker_new= *marker; @@ -341,7 +344,7 @@ MovieTrackingMarker *BKE_tracking_exact_marker(MovieTrackingTrack *track, int fr { MovieTrackingMarker *marker= BKE_tracking_get_marker(track, framenr); - if(marker && marker->framenr!=framenr) + if(marker->framenr!=framenr) return NULL; return marker; @@ -440,7 +443,6 @@ void BKE_tracking_clear_path(MovieTrackingTrack *track, int ref_frame, int actio int BKE_tracking_test_join_tracks(MovieTrackingTrack *dst_track, MovieTrackingTrack *src_track) { int a= 0, b= 0; - /* int tot= dst_track->markersnr+src_track->markersnr; */ /* UNUSED */ int count= 0; while(amarkersnr || bmarkersnr) { @@ -1048,9 +1050,9 @@ int BKE_tracking_next(MovieTrackingContext *context) for(a= 0; anum_tracks; a++) { TrackContext *track_context= &context->track_context[a]; MovieTrackingTrack *track= track_context->track; - MovieTrackingMarker *marker= BKE_tracking_get_marker(track, curfra); + MovieTrackingMarker *marker= BKE_tracking_exact_marker(track, curfra); - if(marker && (marker->flag&MARKER_DISABLED)==0 && marker->framenr==curfra) { + if(marker && (marker->flag&MARKER_DISABLED)==0) { #ifdef WITH_LIBMV int width, height, origin[2], tracked= 0, need_readjust= 0; float pos[2], margin[2]; @@ -1919,10 +1921,8 @@ static float stabilization_auto_scale_factor(MovieTracking *tracking, int width, while(track) { if(track->flag&TRACK_USE_2D_STAB || ((stab->flag&TRACKING_STABILIZE_ROTATION) && track==stab->rot_track)) { - if(track->markersnr) { - sfra= MIN2(sfra, track->markers[0].framenr); - efra= MAX2(efra, track->markers[track->markersnr-1].framenr); - } + sfra= MIN2(sfra, track->markers[0].framenr); + efra= MAX2(efra, track->markers[track->markersnr-1].framenr); } track= track->next; -- cgit v1.2.3