[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51339] trunk/blender/source/blender: Motion Tracking: fixed dopesheet left in incorrect state after joining tracks

[Sergey Sharybin]

Revision: 51339
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51339
Author:   nazgul
Date:     2012-10-15 10:43:10 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Motion Tracking: fixed dopesheet left in incorrect state after joining tracks

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_tracking.h
    trunk/blender/source/blender/blenkernel/intern/tracking.c
    trunk/blender/source/blender/editors/space_clip/tracking_ops.c

Modified: trunk/blender/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_tracking.h	2012-10-15 09:25:03 UTC (rev 51338)
+++ trunk/blender/source/blender/blenkernel/BKE_tracking.h	2012-10-15 10:43:10 UTC (rev 51339)
@@ -80,7 +80,7 @@
 int BKE_tracking_track_has_enabled_marker_at_frame(struct MovieTrackingTrack *track, int framenr);
 
 void BKE_tracking_track_path_clear(struct MovieTrackingTrack *track, int ref_frame, int action);
-void BKE_tracking_tracks_join(struct MovieTrackingTrack *dst_track, struct MovieTrackingTrack *src_track);
+void BKE_tracking_tracks_join(struct MovieTracking *tracking, struct MovieTrackingTrack *dst_track, struct MovieTrackingTrack *src_track);
 
 struct MovieTrackingTrack *BKE_tracking_track_get_named(struct MovieTracking *tracking,
                                                         struct MovieTrackingObject *object,

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2012-10-15 09:25:03 UTC (rev 51338)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2012-10-15 10:43:10 UTC (rev 51339)
@@ -631,7 +631,7 @@
 	}
 }
 
-void BKE_tracking_tracks_join(MovieTrackingTrack *dst_track, MovieTrackingTrack *src_track)
+void BKE_tracking_tracks_join(MovieTracking *tracking, MovieTrackingTrack *dst_track, MovieTrackingTrack *src_track)
 {
 	int i = 0, a = 0, b = 0, tot;
 	MovieTrackingMarker *markers;
@@ -734,6 +734,8 @@
 	dst_track->markersnr = i;
 
 	MEM_freeN(markers);
+
+	BKE_tracking_dopesheet_tag_update(tracking);
 }
 
 MovieTrackingTrack *BKE_tracking_track_get_named(MovieTracking *tracking, MovieTrackingObject *object, const char *name)

Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2012-10-15 09:25:03 UTC (rev 51338)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2012-10-15 10:43:10 UTC (rev 51339)
@@ -2766,7 +2766,7 @@
 		next = track->next;
 
 		if (TRACK_VIEW_SELECTED(sc, track) && track != act_track) {
-			BKE_tracking_tracks_join(act_track, track);
+			BKE_tracking_tracks_join(tracking, act_track, track);
 
 			if (tracking->stabilization.rot_track == track)
 				tracking->stabilization.rot_track = act_track;