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

[Sergey Sharybin]

Revision: 37435
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37435
Author:   nazgul
Date:     2011-06-12 18:25:31 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
Camera tracking integration
===========================

Fixed bug with Blender crashing when active marker isn't tracked for
current frame and MARKER tools are active.

Fixed pool function for active marker data panel.

Thanks to Troy Sobotka and Stephan Kassemeyer for reports.

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

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c	2011-06-12 18:20:36 UTC (rev 37434)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c	2011-06-12 18:25:31 UTC (rev 37435)
@@ -224,7 +224,7 @@
 	SpaceClip *sc= CTX_wm_space_clip(C);
 	MovieClip *clip;
 	int type;
-	MovieTrackingMarker *marker;
+	MovieTrackingTrack *track;
 
 	if(scene->toolsettings->movieclip.tool != MCLIP_TOOL_MARKER || !sc)
 		return 0;
@@ -237,9 +237,12 @@
 	if(!clip || !BKE_movieclip_has_frame(clip, &sc->user))
 		return 0;
 
-	BKE_movieclip_last_selection(clip, &type, (void**)&marker);
+	BKE_movieclip_last_selection(clip, &type, (void**)&track);
 
-	return type==MCLIP_SEL_TRACK;
+	if(type!=MCLIP_SEL_TRACK)
+		return 0;
+
+	return BKE_tracking_has_marker(track, sc->user.framenr);
 }
 
 static void clip_panel_marker(const bContext *C, Panel *pa)