diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
| commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
| tree | 6fb8da94c6e43098c606f768e722484b04b8645c /source/blender/makesrna/intern/rna_camera.c | |
| parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
| parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) | |
merge with trunk at r31523
Diffstat (limited to 'source/blender/makesrna/intern/rna_camera.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_camera.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_camera.c b/source/blender/makesrna/intern/rna_camera.c index ef9a0cf040e..9d82c472882 100644 --- a/source/blender/makesrna/intern/rna_camera.c +++ b/source/blender/makesrna/intern/rna_camera.c @@ -84,13 +84,13 @@ void RNA_def_camera(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Passepartout Alpha", "Opacity (alpha) of the darkened overlay in Camera view"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); - prop= RNA_def_property(srna, "clip_start", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "clip_start", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "clipsta"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_text(prop, "Clip Start", "Camera near clipping distance"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); - prop= RNA_def_property(srna, "clip_end", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "clip_end", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "clipend"); RNA_def_property_range(prop, 1.0f, FLT_MAX); RNA_def_property_ui_text(prop, "Clip End", "Camera far clipping distance"); @@ -114,7 +114,7 @@ void RNA_def_camera(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Orthographic Scale", "Orthographic Camera scale (similar to zoom)"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); - prop= RNA_def_property(srna, "draw_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "draw_size", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "drawsize"); RNA_def_property_range(prop, 0.1f, 1000.0f); RNA_def_property_ui_range(prop, 0.01, 100, 1, 1); @@ -135,7 +135,7 @@ void RNA_def_camera(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Shift Y", "Perspective Camera vertical shift"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); - prop= RNA_def_property(srna, "dof_distance", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "dof_distance", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "YF_dofdist"); RNA_def_property_range(prop, 0.0f, 5000.0f); RNA_def_property_ui_text(prop, "DOF Distance", "Distance to the focus point for depth of field"); @@ -172,7 +172,7 @@ void RNA_def_camera(BlenderRNA *brna) RNA_def_property_enum_items(prop, prop_lens_unit_items); RNA_def_property_ui_text(prop, "Lens Unit", "Unit to edit lens in for the user interface"); - prop= RNA_def_property(srna, "panorama", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_panorama", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CAM_PANORAMA); RNA_def_property_ui_text(prop, "Panorama", "Render the scene with a cylindrical camera for pseudo-fisheye lens effects"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); |