[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42043] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Camera tracking: code cleanup

[Sergey Sharybin]

Revision: 42043
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42043
Author:   nazgul
Date:     2011-11-21 20:43:25 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Camera tracking: code cleanup

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

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-11-21 20:39:06 UTC (rev 42042)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-11-21 20:43:25 UTC (rev 42043)
@@ -231,9 +231,12 @@
 
 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 *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 *marker= BKE_tracking_get_marker(track, framenr);
 
-	if(marker && marker->framenr!=framenr)
+	if(marker->framenr!=framenr)
 		return NULL;
 
 	return marker;
@@ -440,7 +443,6 @@
 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(a<src_track->markersnr || b<dst_track->markersnr) {
@@ -1048,9 +1050,9 @@
 	for(a= 0; a<context->num_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 @@
 		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;