[Bf-blender-cvs] [d486ee2dbdd] master: Update Camera presets
Fynn Grotehans
noreply at git.blender.org
Fri Jun 4 12:20:03 CEST 2021
Commit: d486ee2dbdd34e00a4d575fab6feb3e36b486275
Author: Fynn Grotehans
Date: Fri Jun 4 11:50:23 2021 +0200
Branches: master
https://developer.blender.org/rBd486ee2dbdd34e00a4d575fab6feb3e36b486275
Update Camera presets
The (tracking) camera presets have not been updated in the last 7 or
more years, so they are very outdated. I found it pointless to have a
few specific camera models in the list and instead add the most commonly
used sensor sizes/film sizes. This way the list is shorter, easier to
maintain/becomes later outdated, and is more user friendly for most people
who don't own any of the specific cameras. I added the Crop Factor to the
Beginning of the name, so it gets sortet in the correct order and presets
are easier to find based on the size.
Reviewed By: #render_cycles, #motion_tracking, brecht, sergey
Differential Revision: https://developer.blender.org/D10739
===================================================================
M release/scripts/modules/bpy/path.py
D release/scripts/presets/camera/1_colon_2.3_inch.py
A release/scripts/presets/camera/1_inch.py
A release/scripts/presets/camera/1_slash_1.8_inch.py
A release/scripts/presets/camera/1_slash_2.3_inch.py
R066 release/scripts/presets/camera/1_colon_2.5_inch.py release/scripts/presets/camera/1_slash_2.5_inch.py
A release/scripts/presets/camera/1_slash_2.7_inch.py
R054 release/scripts/presets/camera/iPhone_4.py release/scripts/presets/camera/1_slash_3.2_inch.py
D release/scripts/presets/camera/2_colon_3_inch.py
A release/scripts/presets/camera/2_slash_3_inch.py
D release/scripts/presets/camera/4_colon_3_inch.py
A release/scripts/presets/camera/APS-C.py
A release/scripts/presets/camera/APS-C_(Canon).py
R067 release/scripts/presets/camera/Canon_APS-H.py release/scripts/presets/camera/APS-H_(Canon).py
A release/scripts/presets/camera/Analog_16mm.py
A release/scripts/presets/camera/Analog_35mm.py
A release/scripts/presets/camera/Analog_65mm.py
A release/scripts/presets/camera/Analog_IMAX.py
A release/scripts/presets/camera/Analog_Super_16.py
R067 release/scripts/presets/camera/Super_35_Film.py release/scripts/presets/camera/Analog_Super_35.py
D release/scripts/presets/camera/Arri_Alexa.py
A release/scripts/presets/camera/Arri_Alexa_65.py
A release/scripts/presets/camera/Arri_Alexa_LF.py
A release/scripts/presets/camera/Arri_Alexa_Mini_&_SXT.py
D release/scripts/presets/camera/Blackmagic_Cinema_Camera.py
R066 release/scripts/presets/camera/Blackmagic_Pocket_Cinema_Camera.py release/scripts/presets/camera/Blackmagic_Pocket_&_Studio.py
A release/scripts/presets/camera/Blackmagic_Pocket_4K.py
A release/scripts/presets/camera/Blackmagic_Pocket_6k.py
D release/scripts/presets/camera/Blackmagic_Production_Camera_4K.py
A release/scripts/presets/camera/Blackmagic_URSA_4.6K.py
D release/scripts/presets/camera/Blender.py
D release/scripts/presets/camera/Canon_1100D.py
D release/scripts/presets/camera/Canon_APS-C.py
D release/scripts/presets/camera/Canon_C300.py
A release/scripts/presets/camera/Foveon_(Sigma).py
R065 release/scripts/presets/camera/Full_Frame_35mm_Camera.py release/scripts/presets/camera/Fullframe.py
D release/scripts/presets/camera/GoPro_Hero3_Black.py
D release/scripts/presets/camera/GoPro_Hero3_Silver.py
A release/scripts/presets/camera/MFT.py
A release/scripts/presets/camera/Medium-format_(Hasselblad).py
D release/scripts/presets/camera/Nexus_5.py
D release/scripts/presets/camera/Nikon_D3100.py
D release/scripts/presets/camera/Nikon_DX.py
D release/scripts/presets/camera/Panasonic_AG-HVX200.py
D release/scripts/presets/camera/Panasonic_LX2.py
A release/scripts/presets/camera/RED_Dragon_5K.py
A release/scripts/presets/camera/RED_Dragon_6K.py
A release/scripts/presets/camera/RED_Helium_8K.py
A release/scripts/presets/camera/RED_Monstro_8K.py
D release/scripts/presets/camera/Red_Epic.py
D release/scripts/presets/camera/Red_One_2K.py
D release/scripts/presets/camera/Red_One_3K.py
D release/scripts/presets/camera/Red_One_4K.py
D release/scripts/presets/camera/Samsung_Galaxy_S3.py
D release/scripts/presets/camera/Samsung_Galaxy_S4.py
D release/scripts/presets/camera/Sony_A55.py
D release/scripts/presets/camera/Sony_EX1.py
D release/scripts/presets/camera/Sony_F65.py
D release/scripts/presets/camera/Super_16_Film.py
D release/scripts/presets/camera/iPhone_5.py
D release/scripts/presets/tracking_camera/1__colon__2.3_inch.py
D release/scripts/presets/tracking_camera/1__colon__2.5_inch.py
A release/scripts/presets/tracking_camera/1_inch.py
A release/scripts/presets/tracking_camera/1_slash_1.8_inch.py
A release/scripts/presets/tracking_camera/1_slash_2.3_inch.py
R055 release/scripts/presets/camera/GoPro_Hero3_White.py release/scripts/presets/tracking_camera/1_slash_2.5_inch.py
A release/scripts/presets/tracking_camera/1_slash_2.7_inch.py
R054 release/scripts/presets/camera/iPhone_4S.py release/scripts/presets/tracking_camera/1_slash_3.2_inch.py
D release/scripts/presets/tracking_camera/2__colon__3_inch.py
A release/scripts/presets/tracking_camera/2_slash_3_inch.py
D release/scripts/presets/tracking_camera/4__colon__3_inch.py
A release/scripts/presets/tracking_camera/APS-C.py
A release/scripts/presets/tracking_camera/APS-C_(Canon).py
A release/scripts/presets/tracking_camera/APS-H_(Canon).py
A release/scripts/presets/tracking_camera/Analog_16mm.py
A release/scripts/presets/tracking_camera/Analog_35mm.py
A release/scripts/presets/tracking_camera/Analog_65mm.py
A release/scripts/presets/tracking_camera/Analog_IMAX.py
A release/scripts/presets/tracking_camera/Analog_Super_16.py
A release/scripts/presets/tracking_camera/Analog_Super_35.py
D release/scripts/presets/tracking_camera/Arri_Alexa.py
A release/scripts/presets/tracking_camera/Arri_Alexa_65.py
A release/scripts/presets/tracking_camera/Arri_Alexa_LF.py
A release/scripts/presets/tracking_camera/Arri_Alexa_Mini_&_SXT.py
D release/scripts/presets/tracking_camera/Blackmagic_Cinema_Camera.py
A release/scripts/presets/tracking_camera/Blackmagic_Pocket_&_Studio.py
A release/scripts/presets/tracking_camera/Blackmagic_Pocket_4K.py
A release/scripts/presets/tracking_camera/Blackmagic_Pocket_6k.py
D release/scripts/presets/tracking_camera/Blackmagic_Pocket_Cinema_Camera.py
D release/scripts/presets/tracking_camera/Blackmagic_Production_Camera_4K.py
A release/scripts/presets/tracking_camera/Blackmagic_URSA_4.6K.py
D release/scripts/presets/tracking_camera/Blender.py
D release/scripts/presets/tracking_camera/Canon_1100D.py
D release/scripts/presets/tracking_camera/Canon_APS-C.py
D release/scripts/presets/tracking_camera/Canon_APS-H.py
D release/scripts/presets/tracking_camera/Canon_C300.py
A release/scripts/presets/tracking_camera/Foveon_(Sigma).py
D release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py
A release/scripts/presets/tracking_camera/Fullframe.py
D release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
D release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
D release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
A release/scripts/presets/tracking_camera/MFT.py
A release/scripts/presets/tracking_camera/Medium-format_(Hasselblad).py
D release/scripts/presets/tracking_camera/Nexus_5.py
D release/scripts/presets/tracking_camera/Nikon_D3100.py
D release/scripts/presets/tracking_camera/Nikon_DX.py
D release/scripts/presets/tracking_camera/Panasonic_AG-HVX200.py
D release/scripts/presets/tracking_camera/Panasonic_LX2.py
A release/scripts/presets/tracking_camera/RED_Dragon_5K.py
A release/scripts/presets/tracking_camera/RED_Dragon_6K.py
A release/scripts/presets/tracking_camera/RED_Helium_8K.py
A release/scripts/presets/tracking_camera/RED_Monstro_8K.py
D release/scripts/presets/tracking_camera/Red_Epic.py
D release/scripts/presets/tracking_camera/Red_One_2K.py
D release/scripts/presets/tracking_camera/Red_One_3K.py
D release/scripts/presets/tracking_camera/Red_One_4K.py
D release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
D release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
D release/scripts/presets/tracking_camera/Sony_A55.py
D release/scripts/presets/tracking_camera/Sony_EX1.py
D release/scripts/presets/tracking_camera/Sony_F65.py
D release/scripts/presets/tracking_camera/Super_16.py
D release/scripts/presets/tracking_camera/Super_35.py
D release/scripts/presets/tracking_camera/iPhone_4.py
D release/scripts/presets/tracking_camera/iPhone_4S.py
D release/scripts/presets/tracking_camera/iPhone_5.py
===================================================================
diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py
index e9e9671cc35..1de4542e69e 100644
--- a/release/scripts/modules/bpy/path.py
+++ b/release/scripts/modules/bpy/path.py
@@ -198,6 +198,7 @@ def _clean_utf8(name):
_display_name_literals = {
":": "_colon_",
"+": "_plus_",
+ "/": "_slash_",
}
diff --git a/release/scripts/presets/camera/1_colon_2.3_inch.py b/release/scripts/presets/camera/1_colon_2.3_inch.py
deleted file mode 100644
index 72548384401..00000000000
--- a/release/scripts/presets/camera/1_colon_2.3_inch.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 6.16
-bpy.context.camera.sensor_height = 4.62
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/1_inch.py b/release/scripts/presets/camera/1_inch.py
new file mode 100644
index 00000000000..72b039fb978
--- /dev/null
+++ b/release/scripts/presets/camera/1_inch.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 13.2
+bpy.context.camera.sensor_height = 8.80
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/1_slash_1.8_inch.py b/release/scripts/presets/camera/1_slash_1.8_inch.py
new file mode 100644
index 00000000000..38e09182de6
--- /dev/null
+++ b/release/scripts/presets/camera/1_slash_1.8_inch.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 7.18
+bpy.context.camera.sensor_height = 5.32
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/1_slash_2.3_inch.py b/release/scripts/presets/camera/1_slash_2.3_inch.py
new file mode 100644
index 00000000000..4d55738f4ed
--- /dev/null
+++ b/release/scripts/presets/camera/1_slash_2.3_inch.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 6.17
+bpy.context.camera.sensor_height = 4.55
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/1_colon_2.5_inch.py b/release/scripts/presets/camera/1_slash_2.5_inch.py
similarity index 66%
rename from release/scripts/presets/camera/1_colon_2.5_inch.py
rename to release/scripts/presets/camera/1_slash_2.5_inch.py
index 90f60e7d7f0..cbdb6f3cbe0 100644
--- a/release/scripts/presets/camera/1_colon_2.5_inch.py
+++ b/release/scripts/presets/camera/1_slash_2.5_inch.py
@@ -1,4 +1,4 @@
import bpy
bpy.context.camera.sensor_width = 5.76
bpy.context.camera.sensor_height = 4.29
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/1_slash_2.7_inch.py b/release/scripts/presets/camera/1_slash_2.7_inch.py
new file mode 100644
index 00000000000..5ccfa4ab555
--- /dev/null
+++ b/release/scripts/presets/camera/1_slash_2.7_inch.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 5.37
+bpy.context.camera.sensor_height = 4.04
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/iPhone_4.py b/release/scripts/presets/camera/1_slash_3.2_inch.py
similarity index 54%
rename from release/scripts/presets/camera/iPhone_4.py
rename to release/scripts/presets/camera/1_slash_3.2_inch.py
index 1e43cd11494..1963f7ec048 100644
--- a/release/scripts/presets/camera/iPhone_4.py
+++ b/release/scripts/presets/camera/1_slash_3.2_inch.py
@@ -1,5 +1,4 @@
import bpy
bpy.context.camera.sensor_width = 4.54
bpy.context.camera.sensor_height = 3.42
-bpy.context.camera.lens = 3.85
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/2_colon_3_inch.py b/release/scripts/presets/camera/2_colon_3_inch.py
deleted file mode 100644
index 46436970efc..00000000000
--- a/release/scripts/presets/camera/2_colon_3_inch.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 9.6
-bpy.context.camera.sensor_height = 5.4
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/2_slash_3_inch.py b/release/scripts/presets/camera/2_slash_3_inch.py
new file mode 100644
index 00000000000..25b46016800
--- /dev/null
+++ b/release/scripts/presets/camera/2_slash_3_inch.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 8.8
+bpy.context.camera.sensor_height = 6.6
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/4_colon_3_inch.py b/release/scripts/presets/camera/4_colon_3_inch.py
deleted file mode 100644
index 88346c01ef8..00000000000
--- a/release/scripts/presets/camera/4_colon_3_inch.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 17.31
-bpy.context.camera.sensor_height = 12.98
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/APS-C.py b/release/scripts/presets/camera/APS-C.py
new file mode 100644
index 00000000000..84e40825248
--- /dev/null
+++ b/release/scripts/presets/camera/APS-C.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 23.6
+bpy.context.camera.sensor_height = 15.6
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/APS-C_(Canon).py b/release/scripts/presets/camera/APS-C_(Canon).py
new file mode 100644
index 00000000000..55f20ce0eac
--- /dev/null
+++ b/release/scripts/presets/camera/APS-C_(Canon).py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 22.30
+bpy.context.camera.sensor_height = 14.90
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/Canon_APS-H.py b/release/scripts/presets/camera/APS-H_(Canon).py
similarity index 67%
copy from release/scripts/presets/camera/Canon_APS-H.py
copy to release/scripts/presets/camera/APS-H_(Canon).py
index d3b61d1aa46..d63f733280b 100644
--- a/release/scripts/presets/camera/Canon_APS-H.py
+++ b/release/scripts/presets/camera/APS-H_(Canon).py
@@ -1,4 +1,4 @@
import bpy
bpy.context.camera.sensor_width = 27.90
bpy.context.camera.sensor_height = 18.60
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/Analog_16mm.py b/release/scripts/presets/camera/Analog_16mm.py
new file mode 100644
index 00000000000..aa98eaf2408
--- /dev/null
+++ b/release/scripts/presets/camera/Analog_16mm.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 10.26
+bpy.context.camera.sensor_height = 7.49
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/Analog_35mm.py b/release/scripts/presets/camera/Analog_35mm.py
new file mode 100644
index 00000000000..a0dee1f0166
--- /dev/null
+++ b/release/scripts/presets/camera/Analog_35mm.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 22
+bpy.context.camera.sensor_height = 16
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/Analog_65mm.py b/release/scripts/presets/camera/Analog_65mm.py
new file mode 100644
index 00000000000..8de91ac0ee3
--- /dev/null
+++ b/release/scripts/presets/camera/Analog_65mm.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 52.45
+bpy.context.camera.sensor_height = 23.01
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/Analog_IMAX.py b/release/scripts/presets/camera/Analog_IMAX.py
new file mode 100644
index 00000000000..5a445f3de8c
--- /dev/null
+++ b/release/scripts/presets/camera/Analog_IMAX.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 71.41
+bpy.context.camera.sensor_height = 52.63
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/Analog_Super_16.py b/release/scripts/presets/camera/Analog_Super_16.py
new file mode 100644
index 00000000000..a340a31dc25
--- /dev/null
+++ b/release/scripts/presets/camera/Analog_Super_16.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 12.35
+bpy.context.camera.sensor_height = 7.42
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/Super_35_Film.py b/release/scripts/presets/camera/Analog_Super_35.py
similarity index 67%
copy from release/scripts/presets/camera/Super_35_Film.py
copy to release/scripts/presets/camera/Analog_Super_35.py
index b22ff545c68..3c8f1837253 100644
--- a/release/scripts/presets/camera/Super_35_Film.py
+++ b/release/scripts/presets/camera/Analog_Super_35.py
@@ -1,4 +1,4 @@
import bpy
bpy.context.camera.sensor_width = 24.89
bpy.context.camera.sensor_height = 18.66
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/Arri_Alexa.py b/release/scripts/presets/camera/Arri_Alexa.py
deleted file mode 100644
index 6a6cdfee12b..00000000000
--- a/release/scripts/presets/camera/Arri_Alexa.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 23.760
-bpy.context.camera.sensor_height = 13.365
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Arri_Alexa_65.py b/release/scripts/presets/camera/Arri_Alexa_65.py
new file mode 100644
index 00000000000..b1467709949
--- /dev/null
+++ b/release/scripts/presets/camera/Arri_Alexa_65.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 54.12
+bpy.context.camera.sensor_height = 25.58
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a/release/scripts/presets/camera/Arri_Alexa_LF.py b/release/scripts/presets/camera/Arri_Alexa_LF.py
new file mode 100644
index 00000000000..1cde94fce8d
--- /dev/null
+++ b/release/scripts/presets/camera/Arri_Alexa_LF.py
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 36.70
+bpy.context.camera.sensor_height = 25.54
+bpy.context.camera.sensor_fit = 'HORIZONTAL'
\ No newline at end of file
diff --git a
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list