diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-11 04:19:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-11 04:19:13 +0400 |
| commit | 0f329ebdf19ab7773565b705614c867b01aeadfe (patch) | |
| tree | 0f85ded4a0d7c2bdf7f87fc3aaf59e74acfc326b /release | |
| parent | bcdd9d236cfca0e3f68fc80ad5d8967d18350285 (diff) | |
| parent | fab1ee1f78cd0cba92053e6b569f0cb6126ca2ca (diff) | |
svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_camera.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index e5076fd20d5..80cd5227fca 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -127,6 +127,7 @@ class DATA_PT_camera_display(CameraButtonsPanel, bpy.types.Panel): col.prop(cam, "show_mist", text="Mist") col.prop(cam, "show_title_safe", text="Title Safe") col.prop(cam, "show_name", text="Name") + col.prop_menu_enum(cam, "show_guide") col = split.column() col.prop(cam, "draw_size", text="Size") |