[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37919] branches/soc-2011-salad: Merging r37916 through r37918 from soc-2011-tomato into soc-2011-salad

[Sergey Sharybin]

Revision: 37919
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37919
Author:   nazgul
Date:     2011-06-28 16:46:26 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Merging r37916 through r37918 from soc-2011-tomato into soc-2011-salad

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37916
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37918

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

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37915
/trunk/blender:36834-37910
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37918
/trunk/blender:36834-37910

Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c	2011-06-28 16:44:10 UTC (rev 37918)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c	2011-06-28 16:46:26 UTC (rev 37919)
@@ -255,21 +255,16 @@
 
 void BKE_tracking_clear_path(MovieTrackingTrack *track, int ref_frame)
 {
-	MovieTrackingMarker *marker, new_marker;
+	int a= 1;
 
-	if(track->markersnr==0)
-		return;
+	while(a<track->markersnr) {
+		if(track->markers[a].framenr>ref_frame) {
+			track->markersnr= a;
+			track->markers= MEM_reallocN(track->markers, sizeof(MovieTrackingMarker)*track->markersnr);
+		}
 
-	marker= BKE_tracking_get_marker(track, ref_frame);
-	if(marker) new_marker= *marker;
-	else new_marker= track->markers[0];
-
-	MEM_freeN(track->markers);
-	track->markers= NULL;
-	track->markersnr= 0;
-	track->flag&= ~TRACK_PROCESSED;
-
-	BKE_tracking_insert_marker(track, &new_marker);
+		a++;
+	}
 }
 
 void BKE_tracking_free(MovieTracking *tracking)