diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-26 12:14:14 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-26 12:14:14 +0400 |
| commit | 8285fef0e88e1816bf57b6e14cb659584344c99d (patch) | |
| tree | d7885cd5856631282ec9cd25a0024850bbbf0a00 /source/blender/editors/space_clip | |
| parent | d82c768cc7df3f671d6066730e829c26e2fe6f3c (diff) | |
Fixed for selected bundles drawing in 3D viewport:
- If track was hidded in clip editor it wasn't highlighted in 3d viewport
even if it's selected.
- If two tracks has got the same bundle coordinate and one of them is
selected it might not be highlighted in 3d viewport because of
draw order.
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/clip_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 6dda09a1451..42c127df016 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -586,7 +586,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra } /* pyramid */ - if(sel && TRACK_SELECTED(track) && (track->tracker==TRACKER_KLT) && (marker->flag&MARKER_DISABLED)==0) { + if(sel && TRACK_VIEW_SELECTED(sc, track) && (track->tracker==TRACKER_KLT) && (marker->flag&MARKER_DISABLED)==0) { if(track->flag&TRACK_LOCKED) { if(act) UI_ThemeColor(TH_ACT_MARKER); else if(track->pat_flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64); diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index fc48516b378..18a5d8689c8 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1240,7 +1240,8 @@ static void clear_invisible_track_selection(SpaceClip *sc, MovieClip *clip) MovieTrackingTrack *track = tracksbase->first; while(track) { - BKE_tracking_track_flag(track, hidden, SELECT, 1); + if ((track->flag & TRACK_HIDDEN) == 0) + BKE_tracking_track_flag(track, hidden, SELECT, 1); track = track->next; } @@ -1258,7 +1259,7 @@ static void track_init_markers(SpaceClip *sc, MovieClip *clip, int *frames_limit track= tracksbase->first; while(track) { - if(TRACK_SELECTED(track)) { + if(TRACK_VIEW_SELECTED(sc, track)) { if((track->flag&TRACK_HIDDEN)==0 && (track->flag&TRACK_LOCKED)==0) { BKE_tracking_ensure_marker(track, framenr); |