[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42393] branches/soc-2011-tomato/source/ blender/blenkernel/intern/tracking.c: Revert " Fix a segfault in the tracker caused by attempting a one-frame track after the active tracker has become disabled ."

[Sergey Sharybin]

Revision: 42393
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42393
Author:   nazgul
Date:     2011-12-04 12:06:01 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Revert "Fix a segfault in the tracker caused by attempting a one-frame track after the active tracker has become disabled."

BKE_tracking_next shouldn't be called if there's nothing to track.
Fixed in trunk, would be fixed here after upcoming merge.

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

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-12-04 11:57:23 UTC (rev 42392)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-12-04 12:06:01 UTC (rev 42393)
@@ -766,13 +766,11 @@
 		track= track->next;
 	}
 
-	/* add a context even if there are no tracks, since this is needed if the user tries to track
-	 * on a frame where their tracker is disabled. */
-	context->tracks_map= tracks_map_new(num_tracks, sizeof(TrackContext));
-
 	if(num_tracks) {
 		int width, height;
 
+		context->tracks_map= tracks_map_new(num_tracks, sizeof(TrackContext));
+
 		BKE_movieclip_get_size(clip, user, &width, &height);
 
 		/* create tracking data */
@@ -1163,7 +1161,7 @@
 
 	map_size= tracks_map_size(context->tracks_map);
 
-	/* nothing to track, avoid reading unneeded frames to save time and memory */
+	/* nothing to track, avoid unneeded frames reading to save time and memory */
 	if(!map_size)
 		return 0;