diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /source/blender/makesdna/DNA_camera_types.h | |
parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'source/blender/makesdna/DNA_camera_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_camera_types.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index a15f9a4eb4c..3a9c7b22cde 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -46,7 +46,7 @@ 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; @@ -54,9 +54,7 @@ typedef struct Camera { /* 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 */ - float YF_dofdist, YF_aperture; - short YF_bkhtype, YF_bkhbias; - float YF_bkhrot; + float YF_dofdist; struct Ipo *ipo; // XXX depreceated... old animation system |