merge with trunk r39216

2011-08-10 14:32:03 +00:00
parent 16deef9e79 22694c993a
commit 465c3b82fa
210 changed files with 6222 additions and 3313 deletions
--- a/release/scripts/startup/bl_ui/properties_world.py
+++ b/release/scripts/startup/bl_ui/properties_world.py
@@ -94,7 +94,7 @@ class WORLD_PT_world(WorldButtonsPanel, bpy.types.Panel):
        col.prop(world, "zenith_color")
        col.active = world.use_sky_blend
        row.column().prop(world, "ambient_color")
-        
+
        row = layout.row()
        row.prop(world, "exposure")
        row.prop(world, "color_range")