Configurable sensor size:

- Added support of variable size sensor width and height.
- Added presets for most common cameras, also new presets can be defined by user.
- Added option to control which dimension (vertical or horizontal) of sensor
  size defines FOV. Old behavior of automatic FOV calculation is also kept.
- Renderer, viewport, game engine and collada importer/exporter should
  deal fine with this changes. Other exporters would be updated soon.

1 files changed, 12 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h
index 8ad6821702a..292f920da66 100644
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@ -51,6 +51,7 @@ typedef struct Camera {
 	float passepartalpha;
 	float clipsta, clipend;
 	float lens, ortho_scale, drawsize;
+	float sensor_x, sensor_y;
 	float shiftx, shifty;
 	
 	/* yafray: dof params */
@@ -61,6 +62,9 @@ typedef struct Camera {
 	struct Ipo *ipo;			// XXX depreceated... old animation system
 	
 	struct Object *dof_ob;
+
+	char sensor_fit;
+	char pad[7];
 } Camera;
 
 /* **************** CAMERA ********************* */
@@ -88,10 +92,18 @@ typedef struct Camera {
 #define CAM_ANGLETOGGLE		32
 #define CAM_DS_EXPAND		64
 #define CAM_PANORAMA		128
+#define CAM_SHOWSENSOR		256
 
 /* yafray: dof sampling switch */
 /* #define CAM_YF_NO_QMC	512 */ /* depreceated */
 
+/* Sensor fit */
+#define CAMERA_SENSOR_FIT_AUTO	0
+#define CAMERA_SENSOR_FIT_HOR	1
+#define CAMERA_SENSOR_FIT_VERT	2
+
+#define DEFAULT_SENSOR_WIDTH	32.0f
+#define DEFAULT_SENSOR_HEIGHT	18.0f
 
 #ifdef __cplusplus
 }