[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41618] trunk/blender: Some small fixed for camera tracking:

[Sergey Sharybin]

Revision: 41618
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41618
Author:   nazgul
Date:     2011-11-07 15:32:32 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_clip.py
    trunk/blender/source/blender/editors/space_clip/clip_draw.c
    trunk/blender/source/blender/editors/space_clip/clip_editor.c
    trunk/blender/source/blender/makesrna/intern/rna_tracking.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_clip.py	2011-11-07 15:23:08 UTC (rev 41617)
+++ trunk/blender/release/scripts/startup/bl_ui/space_clip.py	2011-11-07 15:32:32 UTC (rev 41618)
@@ -445,7 +445,7 @@
           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")

Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c	2011-11-07 15:23:08 UTC (rev 41617)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c	2011-11-07 15:32:32 UTC (rev 41618)
@@ -594,7 +594,7 @@
 	}
 
 	/* 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 @@
 			glDisable(GL_LINE_STIPPLE);
 			glPopMatrix();
 		}
-        }
+	}
 
 	if(tiny)
 		glDisable(GL_LINE_STIPPLE);

Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c	2011-11-07 15:23:08 UTC (rev 41617)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c	2011-11-07 15:32:32 UTC (rev 41618)
@@ -184,10 +184,18 @@
 			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);

Modified: trunk/blender/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_tracking.c	2011-11-07 15:23:08 UTC (rev 41617)
+++ trunk/blender/source/blender/makesrna/intern/rna_tracking.c	2011-11-07 15:32:32 UTC (rev 41618)
@@ -488,7 +488,7 @@
 	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);