[Bf-blender-cvs] [0673f86] master: Update the camera presets in various ways:

Sergey Sharybin noreply at git.blender.org
Wed Feb 19 11:07:28 CET 2014 

Commit: 0673f86334f3ac8462d70e5ec1cd6c4b7c197c52
Author: Sergey Sharybin
Date:   Wed Feb 19 16:02:24 2014 +0600
https://developer.blender.org/rB0673f86334f3ac8462d70e5ec1cd6c4b7c197c52

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

===================================================================

A	release/scripts/presets/camera/1__colon__2.3_inch.py
A	release/scripts/presets/camera/1__colon__2.5_inch.py
A	release/scripts/presets/camera/2__colon__3_inch.py
A	release/scripts/presets/camera/4__colon__3_inch.py
D	release/scripts/presets/camera/APS-C_DSLR.py
A	release/scripts/presets/camera/Arri_Alexa.py
A	release/scripts/presets/camera/Blackmagic_Cinema_Camera.py
D	release/scripts/presets/camera/Canon_1D.py
D	release/scripts/presets/camera/Canon_1DS.py
D	release/scripts/presets/camera/Canon_500D.py
D	release/scripts/presets/camera/Canon_550D.py
D	release/scripts/presets/camera/Canon_5D.py
D	release/scripts/presets/camera/Canon_600D.py
D	release/scripts/presets/camera/Canon_60D.py
D	release/scripts/presets/camera/Canon_7D.py
A	release/scripts/presets/camera/Canon_APS-C.py
A	release/scripts/presets/camera/Canon_APS-H.py
A	release/scripts/presets/camera/Canon_C3000.py
A	release/scripts/presets/camera/Full_Frame_35mm_Camera.py
A	release/scripts/presets/camera/GoPro_Hero3_Black.py
A	release/scripts/presets/camera/GoPro_Hero3_Silver.py
A	release/scripts/presets/camera/GoPro_Hero3_White.py
D	release/scripts/presets/camera/Nikon_D300S.py
D	release/scripts/presets/camera/Nikon_D3S.py
D	release/scripts/presets/camera/Nikon_D5000.py
D	release/scripts/presets/camera/Nikon_D5100.py
D	release/scripts/presets/camera/Nikon_D7000.py
D	release/scripts/presets/camera/Nikon_D90.py
A	release/scripts/presets/camera/Nikon_DX.py
A	release/scripts/presets/camera/Panasonic_AG-HVX200.py
A	release/scripts/presets/camera/Panasonic_LX2.py
A	release/scripts/presets/camera/Samsung_Galaxy_S3.py
A	release/scripts/presets/camera/Samsung_Galaxy_S4.py
A	release/scripts/presets/camera/Sony_EX1.py
A	release/scripts/presets/camera/Sony_F65.py
A	release/scripts/presets/camera/Super_16_Film.py
A	release/scripts/presets/camera/Super_35_Film.py
D	release/scripts/presets/camera/full_frame_35mm_film.py
A	release/scripts/presets/camera/iPhone_4.py
A	release/scripts/presets/camera/iPhone_4S.py
A	release/scripts/presets/camera/iPhone_5.py
D	release/scripts/presets/camera/micro_four_thirds.py
D	release/scripts/presets/camera/super_16_film.py
D	release/scripts/presets/camera/super_35_film.py
A	release/scripts/presets/tracking_camera/1__colon__2.3_inch.py
A	release/scripts/presets/tracking_camera/1__colon__2.5_inch.py
A	release/scripts/presets/tracking_camera/2__colon__3_inch.py
A	release/scripts/presets/tracking_camera/4__colon__3_inch.py
A	release/scripts/presets/tracking_camera/Arri_Alexa.py
A	release/scripts/presets/tracking_camera/Blackmagic_Cinema_Camera.py
M	release/scripts/presets/tracking_camera/Canon_1100D.py
D	release/scripts/presets/tracking_camera/Canon_1D.py
D	release/scripts/presets/tracking_camera/Canon_1DS.py
D	release/scripts/presets/tracking_camera/Canon_500D.py
D	release/scripts/presets/tracking_camera/Canon_550D.py
D	release/scripts/presets/tracking_camera/Canon_5D.py
D	release/scripts/presets/tracking_camera/Canon_600D.py
D	release/scripts/presets/tracking_camera/Canon_60D.py
D	release/scripts/presets/tracking_camera/Canon_7D.py
A	release/scripts/presets/tracking_camera/Canon_APS-C.py
A	release/scripts/presets/tracking_camera/Canon_APS-H.py
A	release/scripts/presets/tracking_camera/Canon_C3000.py
A	release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py
A	release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
A	release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
A	release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
D	release/scripts/presets/tracking_camera/Nikon_D300S.py
M	release/scripts/presets/tracking_camera/Nikon_D3100.py
D	release/scripts/presets/tracking_camera/Nikon_D35.py
D	release/scripts/presets/tracking_camera/Nikon_D5000.py
D	release/scripts/presets/tracking_camera/Nikon_D5100.py
D	release/scripts/presets/tracking_camera/Nikon_D7000.py
D	release/scripts/presets/tracking_camera/Nikon_D90.py
A	release/scripts/presets/tracking_camera/Nikon_DX.py
A	release/scripts/presets/tracking_camera/Panasonic_AG-HVX200.py
A	release/scripts/presets/tracking_camera/Panasonic_LX2.py
M	release/scripts/presets/tracking_camera/Red_Epic.py
M	release/scripts/presets/tracking_camera/Red_One_2K.py
M	release/scripts/presets/tracking_camera/Red_One_3K.py
M	release/scripts/presets/tracking_camera/Red_One_4K.py
A	release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
A	release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
M	release/scripts/presets/tracking_camera/Sony_A55.py
A	release/scripts/presets/tracking_camera/Sony_EX1.py
A	release/scripts/presets/tracking_camera/Sony_F65.py
A	release/scripts/presets/tracking_camera/Super_16.py
A	release/scripts/presets/tracking_camera/Super_35.py
A	release/scripts/presets/tracking_camera/iPhone_4.py
A	release/scripts/presets/tracking_camera/iPhone_4S.py
A	release/scripts/presets/tracking_camera/iPhone_5.py

===================================================================

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 0000000..829a060
--- /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 0000000..3ddd240
--- /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 0000000..edf3bbb
--- /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 0000000..6e38782
--- /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 0000000..2bdcf12
--- /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 0000000..402a5b3
--- /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 0bb0e91..0000000
--- 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 158a623..0000000
--- 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 829e03c..0000000
--- 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 829e03c..0000000
--- 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 158a623..0000000
--- 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 829e03c..0000000
--- 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 829e03c..0000000
--- 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 829e03c..0000000
--- 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
similarity index 100%
rename from release/scripts/presets/camera/APS-C_DSLR.py
rename to 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 0000000..d5cc02f
--- /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 0000000..70c760c
--- /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
similarity index 100%
rename from release/scripts/presets/camera/full_frame_35mm_film.py
rename to 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 0000000..9cea698
--- /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 0000000..1eee075
--- /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 0000000..3d1f368
--- /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 e6dc62d..0000000
--- 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 a0505bf..0000000
--- 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 1d819cc..0000000
--- 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 1d819cc..0000000
--- 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 a0505bf..0000000
--- 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
similarity index 100%
rename from release/scripts/presets/c

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list