diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-16 18:06:43 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-16 18:06:43 +0400 |
| commit | d110ae77913610a2c8d676f7c5a99fdcb40ea7d4 (patch) | |
| tree | c9cf98bc43e8f135bd76772b40d1576aa0a09f87 /source/blender/editors/space_clip | |
| parent | d6339e94fe6826610d7afd9ca3dc2a2199ec7af7 (diff) | |
Allow merging two tracks in cases when they've got overlapping tracked/keyframed
frame ranges using average position of both tracks as position/
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 12 |
1 files changed, 0 insertions, 12 deletions
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 @@ -2957,18 +2957,6 @@ static int join_tracks_exec(bContext *C, wmOperator *op) 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; if(TRACK_VIEW_SELECTED(sc, track) && track!=act_track) { |