From d110ae77913610a2c8d676f7c5a99fdcb40ea7d4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 16 Mar 2012 14:06:43 +0000 Subject: Allow merging two tracks in cases when they've got overlapping tracked/keyframed frame ranges using average position of both tracks as position/ --- source/blender/editors/space_clip/tracking_ops.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'source/blender/editors/space_clip') diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index b4990180b19..616fa7d742c 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -2955,18 +2955,6 @@ static int join_tracks_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - track= tracksbase->first; - while(track) { - if(TRACK_VIEW_SELECTED(sc, track) && track!=act_track) { - if(!BKE_tracking_test_join_tracks(act_track, track)) { - BKE_report(op->reports, RPT_ERROR, "Some selected tracks have got keyframed markers to the same frame"); - return OPERATOR_CANCELLED; - } - } - - track= track->next; - } - track= tracksbase->first; while(track) { next= track->next; -- cgit v1.2.3