Update the camera presets in various ways:
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Feb 2014 10:02:24 +0000 (16:02 +0600)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Feb 2014 10:07:12 +0000 (16:07 +0600)
* 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:
release/scripts/presets/camera/1__colon__2.3_inch.py [new file with mode: 0644]
release/scripts/presets/camera/1__colon__2.5_inch.py [new file with mode: 0644]
release/scripts/presets/camera/2__colon__3_inch.py [new file with mode: 0644]
release/scripts/presets/camera/4__colon__3_inch.py [new file with mode: 0644]
release/scripts/presets/camera/Arri_Alexa.py [new file with mode: 0644]
release/scripts/presets/camera/Blackmagic_Cinema_Camera.py [new file with mode: 0644]
release/scripts/presets/camera/Canon_1D.py [deleted file]
release/scripts/presets/camera/Canon_1DS.py [deleted file]
release/scripts/presets/camera/Canon_500D.py [deleted file]
release/scripts/presets/camera/Canon_550D.py [deleted file]
release/scripts/presets/camera/Canon_5D.py [deleted file]
release/scripts/presets/camera/Canon_600D.py [deleted file]
release/scripts/presets/camera/Canon_60D.py [deleted file]
release/scripts/presets/camera/Canon_7D.py [deleted file]
release/scripts/presets/camera/Canon_APS-C.py [moved from release/scripts/presets/camera/APS-C_DSLR.py with 100% similarity]
release/scripts/presets/camera/Canon_APS-H.py [new file with mode: 0644]
release/scripts/presets/camera/Canon_C3000.py [new file with mode: 0644]
release/scripts/presets/camera/Full_Frame_35mm_Camera.py [moved from release/scripts/presets/camera/full_frame_35mm_film.py with 100% similarity]
release/scripts/presets/camera/GoPro_Hero3_Black.py [new file with mode: 0644]
release/scripts/presets/camera/GoPro_Hero3_Silver.py [new file with mode: 0644]
release/scripts/presets/camera/GoPro_Hero3_White.py [new file with mode: 0644]
release/scripts/presets/camera/Nikon_D3S.py [deleted file]
release/scripts/presets/camera/Nikon_D5000.py [deleted file]
release/scripts/presets/camera/Nikon_D5100.py [deleted file]
release/scripts/presets/camera/Nikon_D7000.py [deleted file]
release/scripts/presets/camera/Nikon_D90.py [deleted file]
release/scripts/presets/camera/Nikon_DX.py [moved from release/scripts/presets/camera/Nikon_D300S.py with 100% similarity]
release/scripts/presets/camera/Panasonic_AG-HVX200.py [new file with mode: 0644]
release/scripts/presets/camera/Panasonic_LX2.py [new file with mode: 0644]
release/scripts/presets/camera/Samsung_Galaxy_S3.py [new file with mode: 0644]
release/scripts/presets/camera/Samsung_Galaxy_S4.py [new file with mode: 0644]
release/scripts/presets/camera/Sony_EX1.py [new file with mode: 0644]
release/scripts/presets/camera/Sony_F65.py [new file with mode: 0644]
release/scripts/presets/camera/Super_16_Film.py [moved from release/scripts/presets/camera/super_16_film.py with 100% similarity]
release/scripts/presets/camera/Super_35_Film.py [moved from release/scripts/presets/camera/super_35_film.py with 100% similarity]
release/scripts/presets/camera/iPhone_4.py [new file with mode: 0644]
release/scripts/presets/camera/iPhone_4S.py [new file with mode: 0644]
release/scripts/presets/camera/iPhone_5.py [new file with mode: 0644]
release/scripts/presets/camera/micro_four_thirds.py [deleted file]
release/scripts/presets/tracking_camera/1__colon__2.3_inch.py [moved from release/scripts/presets/tracking_camera/Canon_1D.py with 75% similarity]
release/scripts/presets/tracking_camera/1__colon__2.5_inch.py [moved from release/scripts/presets/tracking_camera/Canon_500D.py with 75% similarity]
release/scripts/presets/tracking_camera/2__colon__3_inch.py [moved from release/scripts/presets/tracking_camera/Canon_550D.py with 75% similarity]
release/scripts/presets/tracking_camera/4__colon__3_inch.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Arri_Alexa.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Blackmagic_Cinema_Camera.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_1100D.py
release/scripts/presets/tracking_camera/Canon_5D.py [deleted file]
release/scripts/presets/tracking_camera/Canon_600D.py [deleted file]
release/scripts/presets/tracking_camera/Canon_7D.py [deleted file]
release/scripts/presets/tracking_camera/Canon_APS-C.py [moved from release/scripts/presets/tracking_camera/Canon_60D.py with 87% similarity]
release/scripts/presets/tracking_camera/Canon_APS-H.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_C3000.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/GoPro_Hero3_White.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Nikon_D300S.py [deleted file]
release/scripts/presets/tracking_camera/Nikon_D3100.py
release/scripts/presets/tracking_camera/Nikon_D35.py [deleted file]
release/scripts/presets/tracking_camera/Nikon_D5000.py [deleted file]
release/scripts/presets/tracking_camera/Nikon_D5100.py [deleted file]
release/scripts/presets/tracking_camera/Nikon_D90.py [deleted file]
release/scripts/presets/tracking_camera/Nikon_DX.py [moved from release/scripts/presets/tracking_camera/Nikon_D7000.py with 87% similarity]
release/scripts/presets/tracking_camera/Panasonic_AG-HVX200.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Panasonic_LX2.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Red_Epic.py
release/scripts/presets/tracking_camera/Red_One_2K.py
release/scripts/presets/tracking_camera/Red_One_3K.py
release/scripts/presets/tracking_camera/Red_One_4K.py
release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Sony_A55.py
release/scripts/presets/tracking_camera/Sony_EX1.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Sony_F65.py [moved from release/scripts/presets/tracking_camera/Canon_1DS.py with 75% similarity]
release/scripts/presets/tracking_camera/Super_16.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Super_35.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/iPhone_4.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/iPhone_4S.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/iPhone_5.py [new file with mode: 0644]

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 (file)
index 0000000..829a060
--- /dev/null
@@ -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 (file)
index 0000000..3ddd240
--- /dev/null
@@ -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 (file)
index 0000000..edf3bbb
--- /dev/null
@@ -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 (file)
index 0000000..6e38782
--- /dev/null
@@ -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 (file)
index 0000000..2bdcf12
--- /dev/null
@@ -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 (file)
index 0000000..402a5b3
--- /dev/null
@@ -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 (file)
index 0bb0e91..0000000
+++ /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 (file)
index 158a623..0000000
+++ /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 (file)
index 829e03c..0000000
+++ /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 (file)
index 829e03c..0000000
+++ /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 (file)
index 158a623..0000000
+++ /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 (file)
index 829e03c..0000000
+++ /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 (file)
index 829e03c..0000000
+++ /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 (file)
index 829e03c..0000000
+++ /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_APS-H.py b/release/scripts/presets/camera/Canon_APS-H.py
new file mode 100644 (file)
index 0000000..d5cc02f
--- /dev/null
@@ -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 (file)
index 0000000..70c760c
--- /dev/null
@@ -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/GoPro_Hero3_Black.py b/release/scripts/presets/camera/GoPro_Hero3_Black.py
new file mode 100644 (file)
index 0000000..9cea698
--- /dev/null
@@ -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 (file)
index 0000000..1eee075
--- /dev/null
@@ -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 (file)
index 0000000..3d1f368
--- /dev/null
@@ -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 (file)
index e6dc62d..0000000
+++ /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 (file)
index a0505bf..0000000
+++ /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 (file)
index 1d819cc..0000000
+++ /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 (file)
index 1d819cc..0000000
+++ /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 (file)
index a0505bf..0000000
+++ /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/Panasonic_AG-HVX200.py b/release/scripts/presets/camera/Panasonic_AG-HVX200.py
new file mode 100644 (file)
index 0000000..ee82cbe
--- /dev/null
@@ -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 (file)
index 0000000..8e0f844
--- /dev/null
@@ -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 (file)
index 0000000..3567004
--- /dev/null
@@ -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 (file)
index 0000000..ae16d41
--- /dev/null
@@ -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 (file)
index 0000000..0070817
--- /dev/null
@@ -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 (file)
index 0000000..e187828
--- /dev/null
@@ -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/iPhone_4.py b/release/scripts/presets/camera/iPhone_4.py
new file mode 100644 (file)
index 0000000..b87dda1
--- /dev/null
@@ -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 (file)
index 0000000..ea747f3
--- /dev/null
@@ -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 (file)
index 0000000..2764788
--- /dev/null
@@ -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 (file)
index 36fb0aa..0000000
+++ /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'
similarity index 75%
rename from release/scripts/presets/tracking_camera/Canon_1D.py
rename to release/scripts/presets/tracking_camera/1__colon__2.3_inch.py
index 89590d3cc1940ca51fe07c70690f481059ba1ba7..218e51a53a6d1dded1e930eaa70868fca8641876 100644 (file)
@@ -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
+
similarity index 75%
rename from release/scripts/presets/tracking_camera/Canon_500D.py
rename to release/scripts/presets/tracking_camera/1__colon__2.5_inch.py
index 3dd66c5b6092abdfdce63766661619525aced2cf..0f16dc9b5030632cc132ae83432606d2a31917e5 100644 (file)
@@ -1,10 +1,10 @@
 import bpy
 camera = bpy.context.edit_movieclip.tracking.camera
 
-camera.sensor_width = 22.3
+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
+
similarity index 75%
rename from release/scripts/presets/tracking_camera/Canon_550D.py
rename to release/scripts/presets/tracking_camera/2__colon__3_inch.py
index 3dd66c5b6092abdfdce63766661619525aced2cf..079d0c6308fcfbd7452f4010f3443dff82e98313 100644 (file)
@@ -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/4__colon__3_inch.py b/release/scripts/presets/tracking_camera/4__colon__3_inch.py
new file mode 100644 (file)
index 0000000..0d3313a
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 17.31
+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/Arri_Alexa.py b/release/scripts/presets/tracking_camera/Arri_Alexa.py
new file mode 100644 (file)
index 0000000..7144f9a
--- /dev/null
@@ -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 (file)
index 0000000..f84d0a1
--- /dev/null
@@ -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
index 7ea78412f4006156d425d21e9287b8bc7851ac67..dc09e3d08964964155f75607db33b20301691682 100644 (file)
@@ -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 (file)
index 7d9b6c8..0000000
+++ /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_600D.py b/release/scripts/presets/tracking_camera/Canon_600D.py
deleted file mode 100644 (file)
index 3dd66c5..0000000
+++ /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 (file)
index 3dd66c5..0000000
+++ /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
similarity index 87%
rename from release/scripts/presets/tracking_camera/Canon_60D.py
rename to release/scripts/presets/tracking_camera/Canon_APS-C.py
index 3dd66c5b6092abdfdce63766661619525aced2cf..c55716a06a8088dc00b36051b9bbce2548db635c 100644 (file)
@@ -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 (file)
index 0000000..0b757ed
--- /dev/null
@@ -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 (file)
index 0000000..24fbbc7
--- /dev/null
@@ -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 (file)
index 0000000..478e535
--- /dev/null
@@ -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 (file)
index 0000000..47e026e
--- /dev/null
@@ -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 (file)
index 0000000..10ca885
--- /dev/null
@@ -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 (file)
index 0000000..c9bda22
--- /dev/null
@@ -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_D300S.py b/release/scripts/presets/tracking_camera/Nikon_D300S.py
deleted file mode 100644 (file)
index 8db8918..0000000
+++ /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
index a112dd22dd2d5be746e1452d65c120223b64877d..44646f8b112fdc8a3a0d09f558559138885d4694 100644 (file)
@@ -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 (file)
index 7d9b6c8..0000000
+++ /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 (file)
index 8db8918..0000000
+++ /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 (file)
index 8db8918..0000000
+++ /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 (file)
index 8db8918..0000000
+++ /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
similarity index 87%
rename from release/scripts/presets/tracking_camera/Nikon_D7000.py
rename to release/scripts/presets/tracking_camera/Nikon_DX.py
index 8db89189cd7ce5472968994f67f890db19fd1dce..8d9e3505e3f55f6677e5e80542f80a995510d62a 100644 (file)
@@ -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 (file)
index 0000000..49cc71f
--- /dev/null
@@ -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 (file)
index 0000000..f9ffcb8
--- /dev/null
@@ -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
index 913b507d296f72e70fe3f2b6d0ad83fb2d457dd1..c0790e6baedffedd5f5435d5cde5c94db60da71a 100644 (file)
@@ -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
index 0a52b377959359d95f46a135cf20372755a82312..fa9585b5e08527858355be58ffb74723de3e11ed 100644 (file)
@@ -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
index 88c232bb9449624fdacce0bd89aef941781acc72..5a1b74721091cefe474961df17eb3d038f924ecd 100644 (file)
@@ -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
index 7ea78412f4006156d425d21e9287b8bc7851ac67..96d6d456337ccd9410172cfe02542eb5a9006461 100644 (file)
@@ -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 (file)
index 0000000..6dbdaef
--- /dev/null
@@ -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 (file)
index 0000000..051cdf6
--- /dev/null
@@ -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
+
index 5805bfa41db6cb1e5e89712a916e2a3f8c2de128..26920d06f94e2b99b765f046e9a6c4e01c6e8309 100644 (file)
@@ -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 (file)
index 0000000..2b99c91
--- /dev/null
@@ -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
similarity index 75%
rename from release/scripts/presets/tracking_camera/Canon_1DS.py
rename to release/scripts/presets/tracking_camera/Sony_F65.py
index 7d9b6c8b39073b820a42df3e6cd936df431a0e32..7da93fd5d476b53dfdaa385df67dd012d8850e9c 100644 (file)
@@ -1,9 +1,8 @@
 import bpy
 camera = bpy.context.edit_movieclip.tracking.camera
 
-camera.sensor_width = 36.0
+camera.sensor_width = 24.33
 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/Super_16.py b/release/scripts/presets/tracking_camera/Super_16.py
new file mode 100644 (file)
index 0000000..f1a8bb3
--- /dev/null
@@ -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 (file)
index 0000000..f533d3e
--- /dev/null
@@ -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 (file)
index 0000000..b0ac497
--- /dev/null
@@ -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 (file)
index 0000000..2569f9b
--- /dev/null
@@ -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 (file)
index 0000000..f7944e3
--- /dev/null
@@ -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
+