Merged changes in the trunk up to revision 34335.

2011-01-15 23:09:52 +00:00
parent bc1e26e496 86bbab7de5
commit c7a122aa27
250 changed files with 14001 additions and 13895 deletions
--- a/release/scripts/ui/properties_render.py
+++ b/release/scripts/ui/properties_render.py
@@ -880,6 +880,7 @@ class RENDER_PT_stamp(RenderButtonsPanel, bpy.types.Panel):
        col.prop(rd, "use_stamp_frame", text="Frame")
        col.prop(rd, "use_stamp_scene", text="Scene")
        col.prop(rd, "use_stamp_camera", text="Camera")
+        col.prop(rd, "use_stamp_lens", text="Lens")
        col.prop(rd, "use_stamp_filename", text="Filename")
        col.prop(rd, "use_stamp_marker", text="Marker")
        col.prop(rd, "use_stamp_sequencer_strip", text="Seq. Strip")