[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39487] branches/soc-2011-tomato/source/ blender/editors/space_clip/tracking_ops.c: Camera tracking integration

[Sergey Sharybin]

Revision: 39487
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39487
Author:   nazgul
Date:     2011-08-17 11:14:21 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================

Small cleanup of code and fixed crash when hiding all markers.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-08-17 11:11:43 UTC (rev 39486)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-08-17 11:14:21 UTC (rev 39487)
@@ -2105,7 +2105,7 @@
 		track= track->next;
 	}
 
-	if(clip->tracking.act_track->flag&TRACK_HIDDEN)
+	if(clip->tracking.act_track && clip->tracking.act_track->flag&TRACK_HIDDEN)
 		clip->tracking.act_track= NULL;
 
 	WM_event_add_notifier(C, NC_MOVIECLIP|ND_DISPLAY, NULL);
@@ -2225,7 +2225,7 @@
 	MovieClip *clip= ED_space_clip(sc);
 	MovieTrackingTrack *track;
 	int pos= RNA_enum_get(op->ptr, "position");
-	int sel_type, delta;
+	int delta;
 
 	if(pos<=1) {	/* jump to path */
 		track= clip->tracking.act_track;
@@ -2312,7 +2312,6 @@
 	SpaceClip *sc= CTX_wm_space_clip(C);
 	MovieClip *clip= ED_space_clip(sc);
 	MovieTrackingTrack *act_track, *track, *next;
-	int sel_type;
 
 	act_track= clip->tracking.act_track;