[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42390] trunk/blender/source/blender/ editors/space_clip/tracking_ops.c: Fix crash when trying to track disabled track.

[Sergey Sharybin]

Revision: 42390
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42390
Author:   nazgul
Date:     2011-12-04 10:57:36 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Fix crash when trying to track disabled track.

This is possible fixes #29498: Seg fault on trying to track byond clip length

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

Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2011-12-04 10:45:25 UTC (rev 42389)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2011-12-04 10:57:36 UTC (rev 42390)
@@ -1209,12 +1209,17 @@
 {
 	int tot= 0;
 	MovieTrackingTrack *track;
+	int framenr= sc->user.framenr;
 
 	track= clip->tracking.tracks.first;
 	while(track) {
-		if(TRACK_VIEW_SELECTED(sc, track) && (track->flag&TRACK_LOCKED)==0)
-			tot++;
+		if(TRACK_VIEW_SELECTED(sc, track) && (track->flag&TRACK_LOCKED)==0) {
+			MovieTrackingMarker *marker= BKE_tracking_exact_marker(track, framenr);
 
+			if (!marker || (marker->flag&MARKER_DISABLED) == 0)
+				tot++;
+		}
+
 		track= track->next;
 	}