diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-05 00:21:40 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-05 00:21:40 +0400 |
| commit | 942d2fe3b7b75facbf280271b1adc31882fc5693 (patch) | |
| tree | d3bdbd3fd41aea01afb5ebdbb9240c8de18f1db7 /source/blender/makesdna | |
| parent | a620ec61ec173b7d9b753c9be443fdbdb1644c71 (diff) | |
| parent | 7b47a4125fa4219a0f6c1a3e8c78047211caaa53 (diff) | |
Cycles: svn merge -r41467:41531 ^/trunk/blender
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_camera_types.h | 12 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 4 |
2 files changed, 15 insertions, 1 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 } diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 3e17d7f4942..d158f227df5 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -265,7 +265,9 @@ typedef struct Object { ListBase *duplilist; /* for temporary dupli list storage, only for use by RNA API */ float ima_ofs[2]; /* offset for image empties */ - char pad3[8]; + + short collision_boundtype; /* bounding box type used for collision */ + char pad3[6]; } Object; /* Warning, this is not used anymore because hooks are now modifiers */ |