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

4 files changed, 14 insertions, 6 deletions

diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index a6ed53039ef..09209017823 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -445,7 +445,7 @@ class CLIP_PT_track_settings(Panel):
           if active.tracker == "KLT":
               layout.prop(active, "pyramid_levels")
           if active.tracker == "SAD":
-              layout.prop(active, "minimum_correlation")
+              layout.prop(active, "correlation_min")
 
         layout.prop(settings, "frames_adjust")
         layout.prop(settings, "speed")
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);
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index 34307f972c5..f72fd3d465c 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -488,7 +488,7 @@ static void rna_def_trackingTrack(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_trackerPyramid_update");
 
 	/* minmal correlation - only used for SAD tracker */
-	prop= RNA_def_property(srna, "minimum_correlation", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "correlation_min", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_float_sdna(prop, NULL, "minimum_correlation");
 	RNA_def_property_range(prop, -1.0f, 1.0f);