diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
commit | dfe2f8dc03267e041102837e92f547fb04881510 (patch) | |
tree | d9582c4667ce5b9e39e2adce40832aa4f44b4fe7 /source/blender/makesdna/DNA_camera_types.h | |
parent | d7e08f2d33207fdf76b1b597ef0de9dec26e3987 (diff) | |
parent | 00e46ef739cf2bfddb8805af056aa59fd3b3c71c (diff) |
Merged changes in the trunk up to revision 28247.
Diffstat (limited to 'source/blender/makesdna/DNA_camera_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_camera_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index a15f9a4eb4c..3b16a16c2b5 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -46,11 +46,13 @@ typedef struct Camera { struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ short type, flag; - float passepartalpha, angle; + float passepartalpha; float clipsta, clipend; float lens, ortho_scale, drawsize; float shiftx, shifty; + float pad; + /* yafray: dof params */ /* qdn: yafray var 'YF_dofdist' now enabled for defocus composit node as well. The name was not changed so that no other files need to be modified */ |