1 files changed, 16 insertions, 8 deletions
diff --git a/intern/libmv/libmv/simple_pipeline/bundle.h b/intern/libmv/libmv/simple_pipeline/bundle.h
index 781bd8476fe..5f420da0045 100644
--- a/intern/libmv/libmv/simple_pipeline/bundle.h
+++ b/intern/libmv/libmv/simple_pipeline/bundle.h
@@ -101,14 +101,22 @@ void EuclideanBundle(const Tracks &tracks,
 */
 enum BundleIntrinsics {
   BUNDLE_NO_INTRINSICS = 0,
-  BUNDLE_FOCAL_LENGTH = 1,
-  BUNDLE_PRINCIPAL_POINT = 2,
-  BUNDLE_RADIAL_K1 = 4,
-  BUNDLE_RADIAL_K2 = 8,
-  BUNDLE_RADIAL = 12,
-  BUNDLE_TANGENTIAL_P1 = 16,
-  BUNDLE_TANGENTIAL_P2 = 32,
-  BUNDLE_TANGENTIAL = 48,
+
+  BUNDLE_FOCAL_LENGTH = (1 << 0),
+  BUNDLE_PRINCIPAL_POINT = (1 << 1),
+
+  BUNDLE_RADIAL_K1 = (1 << 2),
+  BUNDLE_RADIAL_K2 = (1 << 3),
+  BUNDLE_RADIAL_K3 = (1 << 4),
+  BUNDLE_RADIAL_K4 = (1 << 5),
+  BUNDLE_RADIAL = (BUNDLE_RADIAL_K1 |
+                   BUNDLE_RADIAL_K2 |
+                   BUNDLE_RADIAL_K3 |
+                   BUNDLE_RADIAL_K4),
+
+  BUNDLE_TANGENTIAL_P1 = (1 << 6),
+  BUNDLE_TANGENTIAL_P2 = (1 << 7),
+  BUNDLE_TANGENTIAL = (BUNDLE_TANGENTIAL_P1 | BUNDLE_TANGENTIAL_P2),
 };
 enum BundleConstraints {
   BUNDLE_NO_CONSTRAINTS = 0,