Update the camera presets in various ways:

* Switch to using Canon sensor type instead of camera models.
There are a ton of camera models that reuse the same sensor
so it's just confusing and forever incomplete to try and cover
all models.

* Delete all redundant Canon camera models..

* Leave only the Canon camera models that are special, that is
have non regular sensor sizes.

* Fix a few errors in some Canon models.

* Capitalize a few unrelated sensor presets for consistency.

* Added presets for GoPro and iPhone.
Their distortion models and shutter isn't really supported ATM
but tracker is robust enough to give reasonable tracking and
solving results.

Presets are from Daniel Salazar and Sebastian Koenig, thanks!

Differential Revision: https://developer.blender.org/D264

79 files changed, 294 insertions, 153 deletions

diff --git a/release/scripts/presets/camera/1__colon__2.3_inch.py b/release/scripts/presets/camera/1__colon__2.3_inch.py
new file mode 100644
index 00000000000..829a060ab35
--- /dev/null
+++ b/release/scripts/presets/camera/1__colon__2.3_inch.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 6.16
+bpy.context.object.data.sensor_height = 4.62
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/1__colon__2.5_inch.py b/release/scripts/presets/camera/1__colon__2.5_inch.py
new file mode 100644
index 00000000000..3ddd240ab50
--- /dev/null
+++ b/release/scripts/presets/camera/1__colon__2.5_inch.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 5.76
+bpy.context.object.data.sensor_height = 4.29
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/2__colon__3_inch.py b/release/scripts/presets/camera/2__colon__3_inch.py
new file mode 100644
index 00000000000..edf3bbba2c9
--- /dev/null
+++ b/release/scripts/presets/camera/2__colon__3_inch.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 9.6
+bpy.context.object.data.sensor_height = 5.4
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/4__colon__3_inch.py b/release/scripts/presets/camera/4__colon__3_inch.py
new file mode 100644
index 00000000000..6e38782c4d8
--- /dev/null
+++ b/release/scripts/presets/camera/4__colon__3_inch.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 17.31
+bpy.context.object.data.sensor_height = 12.98
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Arri_Alexa.py b/release/scripts/presets/camera/Arri_Alexa.py
new file mode 100644
index 00000000000..2bdcf12240b
--- /dev/null
+++ b/release/scripts/presets/camera/Arri_Alexa.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 23.760
+bpy.context.object.data.sensor_height = 13.365
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Blackmagic_Cinema_Camera.py b/release/scripts/presets/camera/Blackmagic_Cinema_Camera.py
new file mode 100644
index 00000000000..402a5b30cbb
--- /dev/null
+++ b/release/scripts/presets/camera/Blackmagic_Cinema_Camera.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 15.81
+bpy.context.object.data.sensor_height = 8.88
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Canon_1D.py b/release/scripts/presets/camera/Canon_1D.py
deleted file mode 100644
index 0bb0e910377..00000000000
--- a/release/scripts/presets/camera/Canon_1D.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 27.9
-bpy.context.object.data.sensor_height = 18.6
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Canon_1DS.py b/release/scripts/presets/camera/Canon_1DS.py
deleted file mode 100644
index 158a6235f32..00000000000
--- a/release/scripts/presets/camera/Canon_1DS.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 36.0
-bpy.context.object.data.sensor_height = 24.0
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Canon_500D.py b/release/scripts/presets/camera/Canon_500D.py
deleted file mode 100644
index 829e03cc5cf..00000000000
--- a/release/scripts/presets/camera/Canon_500D.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 22.3
-bpy.context.object.data.sensor_height = 14.9
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Canon_550D.py b/release/scripts/presets/camera/Canon_550D.py
deleted file mode 100644
index 829e03cc5cf..00000000000
--- a/release/scripts/presets/camera/Canon_550D.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 22.3
-bpy.context.object.data.sensor_height = 14.9
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Canon_5D.py b/release/scripts/presets/camera/Canon_5D.py
deleted file mode 100644
index 158a6235f32..00000000000
--- a/release/scripts/presets/camera/Canon_5D.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 36.0
-bpy.context.object.data.sensor_height = 24.0
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Canon_600D.py b/release/scripts/presets/camera/Canon_600D.py
deleted file mode 100644
index 829e03cc5cf..00000000000
--- a/release/scripts/presets/camera/Canon_600D.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 22.3
-bpy.context.object.data.sensor_height = 14.9
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Canon_60D.py b/release/scripts/presets/camera/Canon_60D.py
deleted file mode 100644
index 829e03cc5cf..00000000000
--- a/release/scripts/presets/camera/Canon_60D.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 22.3
-bpy.context.object.data.sensor_height = 14.9
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Canon_7D.py b/release/scripts/presets/camera/Canon_7D.py
deleted file mode 100644
index 829e03cc5cf..00000000000
--- a/release/scripts/presets/camera/Canon_7D.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 22.3
-bpy.context.object.data.sensor_height = 14.9
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/APS-C_DSLR.py b/release/scripts/presets/camera/Canon_APS-C.py
index 829e03cc5cf..829e03cc5cf 100644
--- a/release/scripts/presets/camera/APS-C_DSLR.py
+++ b/release/scripts/presets/camera/Canon_APS-C.py
diff --git a/release/scripts/presets/camera/Canon_APS-H.py b/release/scripts/presets/camera/Canon_APS-H.py
new file mode 100644
index 00000000000..d5cc02f4e4a
--- /dev/null
+++ b/release/scripts/presets/camera/Canon_APS-H.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 27.90
+bpy.context.object.data.sensor_height = 18.60
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Canon_C3000.py b/release/scripts/presets/camera/Canon_C3000.py
new file mode 100644
index 00000000000..70c760c73b5
--- /dev/null
+++ b/release/scripts/presets/camera/Canon_C3000.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 24.4
+bpy.context.object.data.sensor_height = 13.5
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/full_frame_35mm_film.py b/release/scripts/presets/camera/Full_Frame_35mm_Camera.py
index d3e141ba4d9..d3e141ba4d9 100644
--- a/release/scripts/presets/camera/full_frame_35mm_film.py
+++ b/release/scripts/presets/camera/Full_Frame_35mm_Camera.py
diff --git a/release/scripts/presets/camera/GoPro_Hero3_Black.py b/release/scripts/presets/camera/GoPro_Hero3_Black.py
new file mode 100644
index 00000000000..9cea698d8ab
--- /dev/null
+++ b/release/scripts/presets/camera/GoPro_Hero3_Black.py
@@ -0,0 +1,6 @@
+import bpy
+bpy.context.object.data.sensor_width = 6.16
+bpy.context.object.data.sensor_height = 4.62
+bpy.context.object.data.lens = 2.77
+
+bpy.context.object.data.sensor_fit = 'AUTO'
diff --git a/release/scripts/presets/camera/GoPro_Hero3_Silver.py b/release/scripts/presets/camera/GoPro_Hero3_Silver.py
new file mode 100644
index 00000000000..1eee0750c2d
--- /dev/null
+++ b/release/scripts/presets/camera/GoPro_Hero3_Silver.py
@@ -0,0 +1,6 @@
+import bpy
+bpy.context.object.data.sensor_width = 5.371
+bpy.context.object.data.sensor_height = 4.035
+bpy.context.object.data.lens = 2.77
+
+bpy.context.object.data.sensor_fit = 'AUTO'
diff --git a/release/scripts/presets/camera/GoPro_Hero3_White.py b/release/scripts/presets/camera/GoPro_Hero3_White.py
new file mode 100644
index 00000000000..3d1f368aab0
--- /dev/null
+++ b/release/scripts/presets/camera/GoPro_Hero3_White.py
@@ -0,0 +1,6 @@
+import bpy
+bpy.context.object.data.sensor_width = 5.76
+bpy.context.object.data.sensor_height = 4.29
+bpy.context.object.data.lens = 2.77
+
+bpy.context.object.data.sensor_fit = 'AUTO'
diff --git a/release/scripts/presets/camera/Nikon_D3S.py b/release/scripts/presets/camera/Nikon_D3S.py
deleted file mode 100644
index e6dc62dc100..00000000000
--- a/release/scripts/presets/camera/Nikon_D3S.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 36.0
-bpy.context.object.data.sensor_height = 23.9
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Nikon_D5000.py b/release/scripts/presets/camera/Nikon_D5000.py
deleted file mode 100644
index a0505bf9b9c..00000000000
--- a/release/scripts/presets/camera/Nikon_D5000.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 23.6
-bpy.context.object.data.sensor_height = 15.8
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Nikon_D5100.py b/release/scripts/presets/camera/Nikon_D5100.py
deleted file mode 100644
index 1d819cce65b..00000000000
--- a/release/scripts/presets/camera/Nikon_D5100.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 23.6
-bpy.context.object.data.sensor_height = 15.6
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Nikon_D7000.py b/release/scripts/presets/camera/Nikon_D7000.py
deleted file mode 100644
index 1d819cce65b..00000000000
--- a/release/scripts/presets/camera/Nikon_D7000.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 23.6
-bpy.context.object.data.sensor_height = 15.6
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Nikon_D90.py b/release/scripts/presets/camera/Nikon_D90.py
deleted file mode 100644
index a0505bf9b9c..00000000000
--- a/release/scripts/presets/camera/Nikon_D90.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 23.6
-bpy.context.object.data.sensor_height = 15.8
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Nikon_D300S.py b/release/scripts/presets/camera/Nikon_DX.py
index a0505bf9b9c..a0505bf9b9c 100644
--- a/release/scripts/presets/camera/Nikon_D300S.py
+++ b/release/scripts/presets/camera/Nikon_DX.py
diff --git a/release/scripts/presets/camera/Panasonic_AG-HVX200.py b/release/scripts/presets/camera/Panasonic_AG-HVX200.py
new file mode 100644
index 00000000000..ee82cbe9bf0
--- /dev/null
+++ b/release/scripts/presets/camera/Panasonic_AG-HVX200.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 4.68
+bpy.context.object.data.sensor_height = 2.633
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Panasonic_LX2.py b/release/scripts/presets/camera/Panasonic_LX2.py
new file mode 100644
index 00000000000..8e0f844e507
--- /dev/null
+++ b/release/scripts/presets/camera/Panasonic_LX2.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 8.5
+bpy.context.object.data.sensor_height = 4.78
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Samsung_Galaxy_S3.py b/release/scripts/presets/camera/Samsung_Galaxy_S3.py
new file mode 100644
index 00000000000..35670042e48
--- /dev/null
+++ b/release/scripts/presets/camera/Samsung_Galaxy_S3.py
@@ -0,0 +1,5 @@
+import bpy
+bpy.context.object.data.sensor_width = 4.8
+bpy.context.object.data.sensor_height = 3.6
+bpy.context.object.data.lens = 3.70
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Samsung_Galaxy_S4.py b/release/scripts/presets/camera/Samsung_Galaxy_S4.py
new file mode 100644
index 00000000000..ae16d4172f9
--- /dev/null
+++ b/release/scripts/presets/camera/Samsung_Galaxy_S4.py
@@ -0,0 +1,5 @@
+import bpy
+bpy.context.object.data.sensor_width = 4.8
+bpy.context.object.data.sensor_height = 3.6
+bpy.context.object.data.lens = 4.20
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Sony_EX1.py b/release/scripts/presets/camera/Sony_EX1.py
new file mode 100644
index 00000000000..00708175b40
--- /dev/null
+++ b/release/scripts/presets/camera/Sony_EX1.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 6.97
+bpy.context.object.data.sensor_height = 3.92
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Sony_F65.py b/release/scripts/presets/camera/Sony_F65.py
new file mode 100644
index 00000000000..e187828058b
--- /dev/null
+++ b/release/scripts/presets/camera/Sony_F65.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 24.33
+bpy.context.object.data.sensor_height = 12.83
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/super_16_film.py b/release/scripts/presets/camera/Super_16_Film.py
index 1e42953bf05..1e42953bf05 100644
--- a/release/scripts/presets/camera/super_16_film.py
+++ b/release/scripts/presets/camera/Super_16_Film.py
diff --git a/release/scripts/presets/camera/super_35_film.py b/release/scripts/presets/camera/Super_35_Film.py
index 65ccb0f216c..65ccb0f216c 100644
--- a/release/scripts/presets/camera/super_35_film.py
+++ b/release/scripts/presets/camera/Super_35_Film.py
diff --git a/release/scripts/presets/camera/iPhone_4.py b/release/scripts/presets/camera/iPhone_4.py
new file mode 100644
index 00000000000..b87dda18097
--- /dev/null
+++ b/release/scripts/presets/camera/iPhone_4.py
@@ -0,0 +1,5 @@
+import bpy
+bpy.context.object.data.sensor_width = 4.54
+bpy.context.object.data.sensor_height = 3.42
+bpy.context.object.data.lens = 3.85
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/iPhone_4S.py b/release/scripts/presets/camera/iPhone_4S.py
new file mode 100644
index 00000000000..ea747f339d4
--- /dev/null
+++ b/release/scripts/presets/camera/iPhone_4S.py
@@ -0,0 +1,5 @@
+import bpy
+bpy.context.object.data.sensor_width = 4.54
+bpy.context.object.data.sensor_height = 3.42
+bpy.context.object.data.lens = 4.28
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/iPhone_5.py b/release/scripts/presets/camera/iPhone_5.py
new file mode 100644
index 00000000000..2764788a405
--- /dev/null
+++ b/release/scripts/presets/camera/iPhone_5.py
@@ -0,0 +1,5 @@
+import bpy
+bpy.context.object.data.sensor_width = 4.54
+bpy.context.object.data.sensor_height = 3.42
+bpy.context.object.data.lens = 4.10
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/micro_four_thirds.py b/release/scripts/presets/camera/micro_four_thirds.py
deleted file mode 100644
index 36fb0aac391..00000000000
--- a/release/scripts/presets/camera/micro_four_thirds.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.object.data.sensor_width = 17.3
-bpy.context.object.data.sensor_height = 13.0
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/tracking_camera/Canon_1D.py b/release/scripts/presets/tracking_camera/1__colon__2.3_inch.py
index 89590d3cc19..218e51a53a6 100644
--- a/release/scripts/presets/tracking_camera/Canon_1D.py
+++ b/release/scripts/presets/tracking_camera/1__colon__2.3_inch.py
@@ -1,10 +1,10 @@
 import bpy
 camera = bpy.context.edit_movieclip.tracking.camera
 
-camera.sensor_width = 27.9
+camera.sensor_width = 6.16
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Canon_1DS.py b/release/scripts/presets/tracking_camera/1__colon__2.5_inch.py
index 7d9b6c8b390..0f16dc9b503 100644
--- a/release/scripts/presets/tracking_camera/Canon_1DS.py
+++ b/release/scripts/presets/tracking_camera/1__colon__2.5_inch.py
@@ -1,10 +1,10 @@
 import bpy
 camera = bpy.context.edit_movieclip.tracking.camera
 
-camera.sensor_width = 36.0
+camera.sensor_width = 5.76
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Canon_500D.py b/release/scripts/presets/tracking_camera/2__colon__3_inch.py
index 3dd66c5b609..079d0c6308f 100644
--- a/release/scripts/presets/tracking_camera/Canon_500D.py
+++ b/release/scripts/presets/tracking_camera/2__colon__3_inch.py
@@ -1,10 +1,10 @@
 import bpy
 camera = bpy.context.edit_movieclip.tracking.camera
 
-camera.sensor_width = 22.3
+camera.sensor_width = 9.6
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Canon_550D.py b/release/scripts/presets/tracking_camera/4__colon__3_inch.py
index 3dd66c5b609..0d3313ab755 100644
--- a/release/scripts/presets/tracking_camera/Canon_550D.py
+++ b/release/scripts/presets/tracking_camera/4__colon__3_inch.py
@@ -1,10 +1,10 @@
 import bpy
 camera = bpy.context.edit_movieclip.tracking.camera
 
-camera.sensor_width = 22.3
+camera.sensor_width = 17.31
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Arri_Alexa.py b/release/scripts/presets/tracking_camera/Arri_Alexa.py
new file mode 100644
index 00000000000..7144f9a03aa
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Arri_Alexa.py
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 23.76
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Blackmagic_Cinema_Camera.py b/release/scripts/presets/tracking_camera/Blackmagic_Cinema_Camera.py
new file mode 100644
index 00000000000..f84d0a19d22
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Blackmagic_Cinema_Camera.py
@@ -0,0 +1,9 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 15.81
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_1100D.py b/release/scripts/presets/tracking_camera/Canon_1100D.py
index 7ea78412f40..dc09e3d0896 100644
--- a/release/scripts/presets/tracking_camera/Canon_1100D.py
+++ b/release/scripts/presets/tracking_camera/Canon_1100D.py
@@ -3,8 +3,8 @@ camera = bpy.context.edit_movieclip.tracking.camera
 
 camera.sensor_width = 22.2
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Canon_5D.py b/release/scripts/presets/tracking_camera/Canon_5D.py
deleted file mode 100644
index 7d9b6c8b390..00000000000
--- a/release/scripts/presets/tracking_camera/Canon_5D.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import bpy
-camera = bpy.context.edit_movieclip.tracking.camera
-
-camera.sensor_width = 36.0
-camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
-camera.pixel_aspect = 1
-camera.k1 = 0.0
-camera.k2 = 0.0
-camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_60D.py b/release/scripts/presets/tracking_camera/Canon_60D.py
deleted file mode 100644
index 3dd66c5b609..00000000000
--- a/release/scripts/presets/tracking_camera/Canon_60D.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import bpy
-camera = bpy.context.edit_movieclip.tracking.camera
-
-camera.sensor_width = 22.3
-camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
-camera.pixel_aspect = 1
-camera.k1 = 0.0
-camera.k2 = 0.0
-camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_7D.py b/release/scripts/presets/tracking_camera/Canon_7D.py
deleted file mode 100644
index 3dd66c5b609..00000000000
--- a/release/scripts/presets/tracking_camera/Canon_7D.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import bpy
-camera = bpy.context.edit_movieclip.tracking.camera
-
-camera.sensor_width = 22.3
-camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
-camera.pixel_aspect = 1
-camera.k1 = 0.0
-camera.k2 = 0.0
-camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_600D.py b/release/scripts/presets/tracking_camera/Canon_APS-C.py
index 3dd66c5b609..c55716a06a8 100644
--- a/release/scripts/presets/tracking_camera/Canon_600D.py
+++ b/release/scripts/presets/tracking_camera/Canon_APS-C.py
@@ -3,8 +3,8 @@ camera = bpy.context.edit_movieclip.tracking.camera
 
 camera.sensor_width = 22.3
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Canon_APS-H.py b/release/scripts/presets/tracking_camera/Canon_APS-H.py
new file mode 100644
index 00000000000..0b757edef20
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Canon_APS-H.py
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 27.90
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Canon_C3000.py b/release/scripts/presets/tracking_camera/Canon_C3000.py
new file mode 100644
index 00000000000..24fbbc78ff7
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Canon_C3000.py
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 24.4
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py b/release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py
new file mode 100644
index 00000000000..478e53584fb
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 36
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py b/release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
new file mode 100644
index 00000000000..47e026e9d00
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
@@ -0,0 +1,11 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 6.16
+camera.units = 'MILLIMETERS'
+camera.focal_length = 2.77
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py b/release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
new file mode 100644
index 00000000000..10ca885769a
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
@@ -0,0 +1,11 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 5.371
+camera.units = 'MILLIMETERS'
+camera.focal_length = 2.77
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/GoPro_Hero3_White.py b/release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
new file mode 100644
index 00000000000..c9bda2258c8
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
@@ -0,0 +1,11 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 5.76
+camera.units = 'MILLIMETERS'
+camera.focal_length = 2.77
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Nikon_D3100.py b/release/scripts/presets/tracking_camera/Nikon_D3100.py
index a112dd22dd2..44646f8b112 100644
--- a/release/scripts/presets/tracking_camera/Nikon_D3100.py
+++ b/release/scripts/presets/tracking_camera/Nikon_D3100.py
@@ -3,7 +3,6 @@ camera = bpy.context.edit_movieclip.tracking.camera
 
 camera.sensor_width = 23.1
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D35.py b/release/scripts/presets/tracking_camera/Nikon_D35.py
deleted file mode 100644
index 7d9b6c8b390..00000000000
--- a/release/scripts/presets/tracking_camera/Nikon_D35.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import bpy
-camera = bpy.context.edit_movieclip.tracking.camera
-
-camera.sensor_width = 36.0
-camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
-camera.pixel_aspect = 1
-camera.k1 = 0.0
-camera.k2 = 0.0
-camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D5000.py b/release/scripts/presets/tracking_camera/Nikon_D5000.py
deleted file mode 100644
index 8db89189cd7..00000000000
--- a/release/scripts/presets/tracking_camera/Nikon_D5000.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import bpy
-camera = bpy.context.edit_movieclip.tracking.camera
-
-camera.sensor_width = 23.6
-camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
-camera.pixel_aspect = 1
-camera.k1 = 0.0
-camera.k2 = 0.0
-camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D5100.py b/release/scripts/presets/tracking_camera/Nikon_D5100.py
deleted file mode 100644
index 8db89189cd7..00000000000
--- a/release/scripts/presets/tracking_camera/Nikon_D5100.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import bpy
-camera = bpy.context.edit_movieclip.tracking.camera
-
-camera.sensor_width = 23.6
-camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
-camera.pixel_aspect = 1
-camera.k1 = 0.0
-camera.k2 = 0.0
-camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D7000.py b/release/scripts/presets/tracking_camera/Nikon_D7000.py
deleted file mode 100644
index 8db89189cd7..00000000000
--- a/release/scripts/presets/tracking_camera/Nikon_D7000.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import bpy
-camera = bpy.context.edit_movieclip.tracking.camera
-
-camera.sensor_width = 23.6
-camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
-camera.pixel_aspect = 1
-camera.k1 = 0.0
-camera.k2 = 0.0
-camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D90.py b/release/scripts/presets/tracking_camera/Nikon_D90.py
deleted file mode 100644
index 8db89189cd7..00000000000
--- a/release/scripts/presets/tracking_camera/Nikon_D90.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import bpy
-camera = bpy.context.edit_movieclip.tracking.camera
-
-camera.sensor_width = 23.6
-camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
-camera.pixel_aspect = 1
-camera.k1 = 0.0
-camera.k2 = 0.0
-camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D300S.py b/release/scripts/presets/tracking_camera/Nikon_DX.py
index 8db89189cd7..8d9e3505e3f 100644
--- a/release/scripts/presets/tracking_camera/Nikon_D300S.py
+++ b/release/scripts/presets/tracking_camera/Nikon_DX.py
@@ -3,7 +3,6 @@ camera = bpy.context.edit_movieclip.tracking.camera
 
 camera.sensor_width = 23.6
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Panasonic_AG-HVX200.py b/release/scripts/presets/tracking_camera/Panasonic_AG-HVX200.py
new file mode 100644
index 00000000000..49cc71fa5da
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Panasonic_AG-HVX200.py
@@ -0,0 +1,9 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 4.68
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1.5
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Panasonic_LX2.py b/release/scripts/presets/tracking_camera/Panasonic_LX2.py
new file mode 100644
index 00000000000..f9ffcb8ec03
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Panasonic_LX2.py
@@ -0,0 +1,9 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 8.5
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Red_Epic.py b/release/scripts/presets/tracking_camera/Red_Epic.py
index 913b507d296..c0790e6baed 100644
--- a/release/scripts/presets/tracking_camera/Red_Epic.py
+++ b/release/scripts/presets/tracking_camera/Red_Epic.py
@@ -3,7 +3,6 @@ camera = bpy.context.edit_movieclip.tracking.camera
 
 camera.sensor_width = 30.0
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Red_One_2K.py b/release/scripts/presets/tracking_camera/Red_One_2K.py
index 0a52b377959..fa9585b5e08 100644
--- a/release/scripts/presets/tracking_camera/Red_One_2K.py
+++ b/release/scripts/presets/tracking_camera/Red_One_2K.py
@@ -3,7 +3,6 @@ camera = bpy.context.edit_movieclip.tracking.camera
 
 camera.sensor_width = 11.1
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Red_One_3K.py b/release/scripts/presets/tracking_camera/Red_One_3K.py
index 88c232bb944..5a1b7472109 100644
--- a/release/scripts/presets/tracking_camera/Red_One_3K.py
+++ b/release/scripts/presets/tracking_camera/Red_One_3K.py
@@ -3,7 +3,6 @@ camera = bpy.context.edit_movieclip.tracking.camera
 
 camera.sensor_width = 16.65
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Red_One_4K.py b/release/scripts/presets/tracking_camera/Red_One_4K.py
index 7ea78412f40..96d6d456337 100644
--- a/release/scripts/presets/tracking_camera/Red_One_4K.py
+++ b/release/scripts/presets/tracking_camera/Red_One_4K.py
@@ -3,7 +3,6 @@ camera = bpy.context.edit_movieclip.tracking.camera
 
 camera.sensor_width = 22.2
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py b/release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
new file mode 100644
index 00000000000..6dbdaefbd2f
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
@@ -0,0 +1,11 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 4.8
+camera.units = 'MILLIMETERS'
+camera.focal_length = 3.70
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py b/release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
new file mode 100644
index 00000000000..051cdf64402
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
@@ -0,0 +1,11 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 4.8
+camera.units = 'MILLIMETERS'
+camera.focal_length = 4.2
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Sony_A55.py b/release/scripts/presets/tracking_camera/Sony_A55.py
index 5805bfa41db..26920d06f94 100644
--- a/release/scripts/presets/tracking_camera/Sony_A55.py
+++ b/release/scripts/presets/tracking_camera/Sony_A55.py
@@ -3,7 +3,6 @@ camera = bpy.context.edit_movieclip.tracking.camera
 
 camera.sensor_width = 23.4
 camera.units = 'MILLIMETERS'
-camera.focal_length = 24.0
 camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Sony_EX1.py b/release/scripts/presets/tracking_camera/Sony_EX1.py
new file mode 100644
index 00000000000..2b99c91d221
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Sony_EX1.py
@@ -0,0 +1,9 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 6.97
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Sony_F65.py b/release/scripts/presets/tracking_camera/Sony_F65.py
new file mode 100644
index 00000000000..7da93fd5d47
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Sony_F65.py
@@ -0,0 +1,9 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 24.33
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Super_16.py b/release/scripts/presets/tracking_camera/Super_16.py
new file mode 100644
index 00000000000..f1a8bb37328
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Super_16.py
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 12.52
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/Super_35.py b/release/scripts/presets/tracking_camera/Super_35.py
new file mode 100644
index 00000000000..f533d3e4bcf
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/Super_35.py
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 24.89
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/iPhone_4.py b/release/scripts/presets/tracking_camera/iPhone_4.py
new file mode 100644
index 00000000000..b0ac49706b3
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/iPhone_4.py
@@ -0,0 +1,11 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 4.54
+camera.units = 'MILLIMETERS'
+camera.focal_length = 3.85
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/iPhone_4S.py b/release/scripts/presets/tracking_camera/iPhone_4S.py
new file mode 100644
index 00000000000..2569f9b412b
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/iPhone_4S.py
@@ -0,0 +1,11 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 4.54
+camera.units = 'MILLIMETERS'
+camera.focal_length = 4.28
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+
diff --git a/release/scripts/presets/tracking_camera/iPhone_5.py b/release/scripts/presets/tracking_camera/iPhone_5.py
new file mode 100644
index 00000000000..f7944e3fa63
--- /dev/null
+++ b/release/scripts/presets/tracking_camera/iPhone_5.py
@@ -0,0 +1,11 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 4.54
+camera.units = 'MILLIMETERS'
+camera.focal_length = 4.10
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
+