Merged changes in the trunk up to revision 31499.

2010-08-21 17:05:07 +00:00
parent 32302db13c e242f66ae6
commit bdd23c1a58
129 changed files with 3800 additions and 2798 deletions
--- a/release/scripts/ui/properties_render.py
+++ b/release/scripts/ui/properties_render.py
@@ -574,7 +574,7 @@ class RENDER_PT_output(RenderButtonsPanel, bpy.types.Panel):

            subsplit = split.split()
            col = subsplit.column()
-            col.prop(rd, "exr_half")
+            col.prop(rd, "use_exr_half")
            col.prop(rd, "exr_zbuf")

            col = subsplit.column()