[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59441] branches/soc-2013-motion_track/ extern/libmv/libmv-capi.cc: Fix ignored constraint flag

[Joseph Mansfield]

Revision: 59441
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59441
Author:   sftrabbit
Date:     2013-08-23 20:38:36 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Fix ignored constraint flag

Incorrect flags were being checked for whether a focal lenght constraint should be applied, causing it to always be applied whenever the focal length was chosen for refinement.

Modified Paths:
--------------
    branches/soc-2013-motion_track/extern/libmv/libmv-capi.cc

Modified: branches/soc-2013-motion_track/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2013-motion_track/extern/libmv/libmv-capi.cc	2013-08-23 20:35:00 UTC (rev 59440)
+++ branches/soc-2013-motion_track/extern/libmv/libmv-capi.cc	2013-08-23 20:38:36 UTC (rev 59441)
@@ -557,6 +557,7 @@
 
 	const int motion_flag = reconstruction_options.motion_flag;
 	const int refine_intrinsics = reconstruction_options.refine_intrinsics;
+	const int constrain_intrinsics = reconstruction_options.constrain_intrinsics;
 
 	if (motion_flag & LIBMV_TRACKING_MOTION_MODAL) {
 		bundle_options.constraints |= libmv::BUNDLE_NO_TRANSLATION;
@@ -564,7 +565,7 @@
 
 	if (refine_intrinsics & LIBMV_REFINE_FOCAL_LENGTH) {
 		bundle_options.bundle_intrinsics |= libmv::BUNDLE_FOCAL_LENGTH;
-		if (refine_intrinsics & LIBMV_CONSTRAIN_FOCAL_LENGTH) {
+		if (constrain_intrinsics & LIBMV_CONSTRAIN_FOCAL_LENGTH) {
 			bundle_options.constraints |= libmv::BUNDLE_CONSTRAIN_FOCAL_LENGTH;
 			bundle_options.focal_length_min = reconstruction_options.focal_length_min;
 			bundle_options.focal_length_max = reconstruction_options.focal_length_max;