diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-21 01:02:12 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-21 01:02:12 +0400 |
| commit | 2676f2d58f71f438008b413a86b873e7787d80ea (patch) | |
| tree | eb541972cf32d5958b7c0f7f8ece525b78cfcbff /source/blender/render/intern/include/render_types.h | |
| parent | bb9976f058ba2090812074e1b774213d20821a30 (diff) | |
| parent | 4ab1dadf72a821b344a714fff59aed11d15ecb14 (diff) | |
Merged changes in the trunk up to revision 42021.
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index dce7484d702..9e522fae4e4 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -152,10 +152,7 @@ struct Render int partx, party; /* values for viewing */ - float lens; - float sensor_x, sensor_y; /* image sensor size, same variable in camera */ float ycor; /* (scene->xasp / scene->yasp), multiplied with 'winy' */ - short sensor_fit; float panophi, panosi, panoco, panodxp, panodxv; |