diff options
Diffstat (limited to 'source/blender/makesdna/DNA_camera_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_camera_types.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index c99494ce00e..c67a356a708 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -33,7 +33,7 @@ #define __DNA_CAMERA_TYPES_H__ #include "DNA_defs.h" - +#include "DNA_gpu_types.h" #include "DNA_ID.h" #ifdef __cplusplus @@ -56,7 +56,7 @@ typedef struct Camera { float lens, ortho_scale, drawsize; float sensor_x, sensor_y; float shiftx, shifty; - + /* yafray: dof params */ /* qdn: yafray var 'YF_dofdist' now enabled for defocus composite node as well. * The name was not changed so that no other files need to be modified */ @@ -65,6 +65,7 @@ typedef struct Camera { struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ struct Object *dof_ob; + struct GPUDOFSettings gpu_dof; char sensor_fit; char pad[7]; @@ -96,12 +97,13 @@ enum { CAM_SHOWLIMITS = (1 << 0), CAM_SHOWMIST = (1 << 1), CAM_SHOWPASSEPARTOUT = (1 << 2), - CAM_SHOWTITLESAFE = (1 << 3), + CAM_SHOW_SAFE_MARGINS = (1 << 3), CAM_SHOWNAME = (1 << 4), CAM_ANGLETOGGLE = (1 << 5), CAM_DS_EXPAND = (1 << 6), CAM_PANORAMA = (1 << 7), /* deprecated */ CAM_SHOWSENSOR = (1 << 8), + CAM_SHOW_SAFE_CENTER = (1 << 9), }; #if (DNA_DEPRECATED_GCC_POISON == 1) |