diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-07 19:32:32 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-07 19:32:32 +0400 |
| commit | a3e5bd02bbf9883953ccc423726e5b5c0ee5aac0 (patch) | |
| tree | 79bed7f08e89346663e8203580f07650021c4003 /source/blender/editors | |
| parent | 9b5652215abb91e5aa3ce40664fc0067567382b0 (diff) | |
Some small fixed for camera tracking:
- Lock to selection and center to selection will now work fine with undistorted rendering
- Do not display pyramid for disabled tracks
- Corrected fix for wrong correlation_min property name
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_clip/clip_draw.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/clip_editor.c | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 0da68953593..9eb96a9a4c5 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -594,7 +594,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra } /* pyramid */ - if((sel == TRACK_SELECTED(track) && sel && (sc->flag&SC_SHOW_PYRAMID_LEVELS) && (track->tracker==TRACKER_KLT))) { + if(sel && TRACK_SELECTED(track) && (sc->flag&SC_SHOW_PYRAMID_LEVELS) && (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); @@ -626,7 +626,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra glDisable(GL_LINE_STIPPLE); glPopMatrix(); } - } + } if(tiny) glDisable(GL_LINE_STIPPLE); diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 0de7fed1f1a..c5036145792 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -184,10 +184,18 @@ static int selected_boundbox(SpaceClip *sc, float min[2], float max[2]) if(marker) { float pos[3]; - pos[0]= (marker->pos[0]+track->offset[0])*width; - pos[1]= (marker->pos[1]+track->offset[1])*height; + pos[0]= marker->pos[0]+track->offset[0]; + pos[1]= marker->pos[1]+track->offset[1]; pos[2]= 0.0f; + /* undistortion happens for normalized coords */ + if(sc->user.render_flag&MCLIP_PROXY_RENDER_UNDISTORT) + /* undistortion happens for normalized coords */ + ED_clip_point_undistorted_pos(sc, pos, pos); + + pos[0]*= width; + pos[1]*= height; + mul_v3_m4v3(pos, sc->stabmat, pos); DO_MINMAX2(pos, min, max); |