Tomato: camera sensor changes

* Rename "FOV Mode" to "Sensor Fit"
* Add sensor height back in presets, default to Horizontal fit for all presets
  except Blender, which uses Automatic.
* Some UI tweaks

28 files changed, 65 insertions, 5 deletions

diff --git a/release/scripts/presets/camera/APS-C_DSLR.py b/release/scripts/presets/camera/APS-C_DSLR.py
index facaa449079..829e03cc5cf 100644
--- a/release/scripts/presets/camera/APS-C_DSLR.py
+++ b/release/scripts/presets/camera/APS-C_DSLR.py
@@ -1,2 +1,4 @@
 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/Blender.py b/release/scripts/presets/camera/Blender.py
index 52143ced67d..9fa4ab752e3 100644
--- a/release/scripts/presets/camera/Blender.py
+++ b/release/scripts/presets/camera/Blender.py
@@ -1,2 +1,4 @@
 import bpy
 bpy.context.object.data.sensor_width = 32
+bpy.context.object.data.sensor_height = 18
+bpy.context.object.data.sensor_fit = 'AUTO'
diff --git a/release/scripts/presets/camera/Canon_1100D.py b/release/scripts/presets/camera/Canon_1100D.py
index ae6a4c2c893..54f2cf75b54 100644
--- a/release/scripts/presets/camera/Canon_1100D.py
+++ b/release/scripts/presets/camera/Canon_1100D.py
@@ -1,2 +1,4 @@
 import bpy
 bpy.context.object.data.sensor_width = 22.2
+bpy.context.object.data.sensor_height = 14.7
+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
index 3b7fdecfc96..0bb0e910377 100644
--- a/release/scripts/presets/camera/Canon_1D.py
+++ b/release/scripts/presets/camera/Canon_1D.py
@@ -1,2 +1,4 @@
 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
index dd1c1370d80..158a6235f32 100644
--- a/release/scripts/presets/camera/Canon_1DS.py
+++ b/release/scripts/presets/camera/Canon_1DS.py
@@ -1,2 +1,4 @@
 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
index facaa449079..829e03cc5cf 100644
--- a/release/scripts/presets/camera/Canon_500D.py
+++ b/release/scripts/presets/camera/Canon_500D.py
@@ -1,2 +1,4 @@
 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
index facaa449079..829e03cc5cf 100644
--- a/release/scripts/presets/camera/Canon_550D.py
+++ b/release/scripts/presets/camera/Canon_550D.py
@@ -1,2 +1,4 @@
 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
index dd1c1370d80..158a6235f32 100644
--- a/release/scripts/presets/camera/Canon_5D.py
+++ b/release/scripts/presets/camera/Canon_5D.py
@@ -1,2 +1,4 @@
 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
index facaa449079..829e03cc5cf 100644
--- a/release/scripts/presets/camera/Canon_600D.py
+++ b/release/scripts/presets/camera/Canon_600D.py
@@ -1,2 +1,4 @@
 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
index facaa449079..829e03cc5cf 100644
--- a/release/scripts/presets/camera/Canon_60D.py
+++ b/release/scripts/presets/camera/Canon_60D.py
@@ -1,2 +1,4 @@
 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
index facaa449079..829e03cc5cf 100644
--- a/release/scripts/presets/camera/Canon_7D.py
+++ b/release/scripts/presets/camera/Canon_7D.py
@@ -1,2 +1,4 @@
 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/Nikon_D300S.py b/release/scripts/presets/camera/Nikon_D300S.py
index bcafd2146ba..a0505bf9b9c 100644
--- a/release/scripts/presets/camera/Nikon_D300S.py
+++ b/release/scripts/presets/camera/Nikon_D300S.py
@@ -1,2 +1,4 @@
 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_D3100.py b/release/scripts/presets/camera/Nikon_D3100.py
index 8dbd1df927c..238d9c22d12 100644
--- a/release/scripts/presets/camera/Nikon_D3100.py
+++ b/release/scripts/presets/camera/Nikon_D3100.py
@@ -1,2 +1,4 @@
 import bpy
 bpy.context.object.data.sensor_width = 23.1
+bpy.context.object.data.sensor_height = 15.4
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Nikon_D35.py b/release/scripts/presets/camera/Nikon_D35.py
index dd1c1370d80..e6dc62dc100 100644
--- a/release/scripts/presets/camera/Nikon_D35.py
+++ b/release/scripts/presets/camera/Nikon_D35.py
@@ -1,2 +1,4 @@
 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
index bcafd2146ba..a0505bf9b9c 100644
--- a/release/scripts/presets/camera/Nikon_D5000.py
+++ b/release/scripts/presets/camera/Nikon_D5000.py
@@ -1,2 +1,4 @@
 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
index bcafd2146ba..1d819cce65b 100644
--- a/release/scripts/presets/camera/Nikon_D5100.py
+++ b/release/scripts/presets/camera/Nikon_D5100.py
@@ -1,2 +1,4 @@
 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
index bcafd2146ba..1d819cce65b 100644
--- a/release/scripts/presets/camera/Nikon_D7000.py
+++ b/release/scripts/presets/camera/Nikon_D7000.py
@@ -1,2 +1,4 @@
 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
index bcafd2146ba..a0505bf9b9c 100644
--- a/release/scripts/presets/camera/Nikon_D90.py
+++ b/release/scripts/presets/camera/Nikon_D90.py
@@ -1,2 +1,4 @@
 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/Red_Epic.py b/release/scripts/presets/camera/Red_Epic.py
index 1acc53924e6..14f4abaee90 100644
--- a/release/scripts/presets/camera/Red_Epic.py
+++ b/release/scripts/presets/camera/Red_Epic.py
@@ -1,2 +1,4 @@
 import bpy
 bpy.context.object.data.sensor_width = 30.0
+bpy.context.object.data.sensor_height = 15.0
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Red_One_2K.py b/release/scripts/presets/camera/Red_One_2K.py
index bf6f986e354..ef2708f75b2 100644
--- a/release/scripts/presets/camera/Red_One_2K.py
+++ b/release/scripts/presets/camera/Red_One_2K.py
@@ -1,2 +1,4 @@
 import bpy
 bpy.context.object.data.sensor_width = 11.1
+bpy.context.object.data.sensor_height = 6.24
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Red_One_3K.py b/release/scripts/presets/camera/Red_One_3K.py
index 4867839028b..5ddff2746eb 100644
--- a/release/scripts/presets/camera/Red_One_3K.py
+++ b/release/scripts/presets/camera/Red_One_3K.py
@@ -1,2 +1,4 @@
 import bpy
 bpy.context.object.data.sensor_width = 16.65
+bpy.context.object.data.sensor_height = 9.36
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/Red_One_4K.py b/release/scripts/presets/camera/Red_One_4K.py
index ae6a4c2c893..8ab9b38cbd5 100644
--- a/release/scripts/presets/camera/Red_One_4K.py
+++ b/release/scripts/presets/camera/Red_One_4K.py
@@ -1,2 +1,4 @@
 import bpy
 bpy.context.object.data.sensor_width = 22.2
+bpy.context.object.data.sensor_height = 12.6
+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_film.py
index e9301942b3b..d3e141ba4d9 100644
--- a/release/scripts/presets/camera/full_frame_35mm_film.py
+++ b/release/scripts/presets/camera/full_frame_35mm_film.py
@@ -1,2 +1,4 @@
 import bpy
 bpy.context.object.data.sensor_width = 36
+bpy.context.object.data.sensor_height = 24
+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
index a6785886f5a..36fb0aac391 100644
--- a/release/scripts/presets/camera/micro_four_thirds.py
+++ b/release/scripts/presets/camera/micro_four_thirds.py
@@ -1,2 +1,4 @@
 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/camera/super_16_film.py b/release/scripts/presets/camera/super_16_film.py
index 36e4ea153fa..1e42953bf05 100644
--- a/release/scripts/presets/camera/super_16_film.py
+++ b/release/scripts/presets/camera/super_16_film.py
@@ -1,2 +1,4 @@
 import bpy
 bpy.context.object.data.sensor_width = 12.52
+bpy.context.object.data.sensor_height = 7.41
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/presets/camera/super_35_film.py b/release/scripts/presets/camera/super_35_film.py
index 641f7034b67..65ccb0f216c 100644
--- a/release/scripts/presets/camera/super_35_film.py
+++ b/release/scripts/presets/camera/super_35_film.py
@@ -1,2 +1,4 @@
 import bpy
 bpy.context.object.data.sensor_width = 24.89
+bpy.context.object.data.sensor_height = 18.66
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py
index e4b926653ab..ac19bab4c66 100644
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -208,7 +208,7 @@ class AddPresetCamera(AddPresetBase, Operator):
     preset_values = [
         "cam.sensor_width",
         "cam.sensor_height",
-        "cam.fov_mode"
+        "cam.sensor_fit"
     ]
 
     preset_subdir = "camera"
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index 7a65369285b..4adaad75e42 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -129,12 +129,20 @@ class DATA_PT_camera(CameraButtonsPanel, Panel):
         row.operator("camera.preset_add", text="", icon="ZOOMIN")
         row.operator("camera.preset_add", text="", icon="ZOOMOUT").remove_active = True
 
-        layout.prop(cam, "fov_mode")
+        layout.label(text="Sensor:")
 
-        col = layout.column(align=True)
-        col.prop(cam, "sensor_width")
-        col.prop(cam, "sensor_height")
+        split = layout.split()
+
+        col = split.column(align=True)
+        if cam.sensor_fit == 'AUTO':
+            col.prop(cam, "sensor_width", text="Size")
+        else:
+            col.prop(cam, "sensor_width", text="Width")
+            col.prop(cam, "sensor_height", text="Height")
 
+        col = split.column(align=True)
+        col.prop(cam, "sensor_fit", text="")
+ 
         layout.label(text="Clipping:")
         row = layout.row(align=True)
         row.prop(cam, "clip_start", text="Start")