[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41905] trunk/blender: Camera tracking: forbid focal length=0 and small code cleanup

[Sergey Sharybin]

Revision: 41905
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41905
Author:   nazgul
Date:     2011-11-16 10:00:02 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Camera tracking: forbid focal length=0 and small code cleanup

Modified Paths:
--------------
    trunk/blender/extern/libmv/libmv-capi.cpp
    trunk/blender/source/blender/makesrna/intern/rna_tracking.c

Modified: trunk/blender/extern/libmv/libmv-capi.cpp
===================================================================
--- trunk/blender/extern/libmv/libmv-capi.cpp	2011-11-16 06:17:56 UTC (rev 41904)
+++ trunk/blender/extern/libmv/libmv-capi.cpp	2011-11-16 10:00:02 UTC (rev 41905)
@@ -368,14 +368,11 @@
 	intrinsics->SetPrincipalPoint(principal_x, principal_y);
 	intrinsics->SetRadialDistortion(k1, k2, k3);
 
-	if(focal_length) {
-		/* do a lens undistortion if focal length is non-zero only */
-		for (int i = 0; i < markers.size(); ++i) {
-			intrinsics->InvertIntrinsics(markers[i].x,
-				markers[i].y,
-				&(markers[i].x),
-				&(markers[i].y));
-		}
+	for (int i = 0; i < markers.size(); ++i) {
+		intrinsics->InvertIntrinsics(markers[i].x,
+			markers[i].y,
+			&(markers[i].x),
+			&(markers[i].y));
 	}
 
 	libmv::Tracks normalized_tracks(markers);

Modified: trunk/blender/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_tracking.c	2011-11-16 06:17:56 UTC (rev 41904)
+++ trunk/blender/source/blender/makesrna/intern/rna_tracking.c	2011-11-16 10:00:02 UTC (rev 41905)
@@ -169,7 +169,8 @@
 	if(clip->lastsize[0])
 		value= clip->lastsize[0]*value/camera->sensor_width;
 
-	camera->focal= value;
+	if(value>=0.0001)
+		camera->focal= value;
 }
 
 static int rna_track_2d_stabilization(CollectionPropertyIterator *UNUSED(iter), void *data)
@@ -372,7 +373,7 @@
 	/* Focal Length */
 	prop= RNA_def_property(srna, "focal_length", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "focal");
-	RNA_def_property_range(prop, 0.0f, 5000.0f);
+	RNA_def_property_range(prop, 0.0001f, 5000.0f);
 	RNA_def_property_float_funcs(prop, "rna_trackingCamera_focal_mm_get", "rna_trackingCamera_focal_mm_set", NULL);
 	RNA_def_property_ui_text(prop, "Focal Length", "Camera's focal length");
 	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);