[Bf-blender-cvs] [c2fe44f] soc-2013-depsgraph_mt: Merge branch 'master' into soc-2013-depsgraph_mt

[Sergey Sharybin]

Commit: c2fe44fcc4a464ab3e7fb3353bdd030fa8b3c427
Author: Sergey Sharybin
Date:   Tue Dec 17 22:42:15 2013 +0600
http://developer.blender.org/rBc2fe44fcc4a464ab3e7fb3353bdd030fa8b3c427

Merge branch 'master' into soc-2013-depsgraph_mt

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/properties_render.py
index 173df9e,5c2e3e5..1bcf650
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@@ -69,12 -69,8 +69,10 @@@ class RENDER_PT_render(RenderButtonsPan
          row.operator("render.render", text="Animation", icon='RENDER_ANIMATION').animation = True
          row.operator("sound.mixdown", text="Audio", icon='PLAY_AUDIO')
  
-         split = layout.split(1 / 3)
-         split.operator("render.play_rendered_anim", text="Play", icon='PLAY')
-         split.prop(rd, "display_mode", text="Display")
+         layout.prop(rd, "display_mode", text="Display")
  
 +        layout.prop(rd, "use_lock_interface")
 +
  
  class RENDER_PT_dimensions(RenderButtonsPanel, Panel):
      bl_label = "Dimensions"