diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 15:31:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 15:31:31 +0400 |
| commit | 7b2101ace983cc9d7112dd45a8b264b51657dea9 (patch) | |
| tree | c1d75f2ae3f30fe9de51c1c7332e862064a93193 /source/blender/editors/transform/transform_generics.c | |
| parent | 787ea5feb4a80babccd86689b066153ac57db91c (diff) | |
| parent | a87c5eb52cd4951b138f518bf12d498bc5e5eb8a (diff) | |
svn merge ^/trunk/blender -r43482:43524
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index e917b7d4c96..4073081ffc2 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -644,24 +644,11 @@ static void recalcData_clip(TransInfo *t) ListBase *tracksbase= BKE_tracking_get_tracks(&clip->tracking); MovieTrackingTrack *track; - if(t->state == TRANS_CANCEL) { - track= tracksbase->first; - while(track) { - if(TRACK_VIEW_SELECTED(sc, track)) { - MovieTrackingMarker *marker= BKE_tracking_ensure_marker(track, sc->user.framenr); - - marker->flag= track->transflag; - } - - track= track->next; - } - } - flushTransTracking(t); track= tracksbase->first; while(track) { - if(TRACK_VIEW_SELECTED(sc, track)) { + if(TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED)==0) { if (t->mode == TFM_TRANSLATION) { if(TRACK_AREA_SELECTED(track, TRACK_AREA_PAT)) BKE_tracking_clamp_track(track, CLAMP_PAT_POS); |