Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-11-07 19:32:32 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-11-07 19:32:32 +0400
commita3e5bd02bbf9883953ccc423726e5b5c0ee5aac0 (patch)
tree79bed7f08e89346663e8203580f07650021c4003 /source/blender/editors/space_clip/clip_draw.c
parent9b5652215abb91e5aa3ce40664fc0067567382b0 (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/space_clip/clip_draw.c')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c4
1 files changed, 2 insertions, 2 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);