[Bf-blender-cvs] [e7ee56a] soc-2013-paint: Merge branch 'master' into soc-2013-paint

[Antony Riakiotakis]

Commit: e7ee56afe2c1a931e6037366e21671f3a4c1ab34
Author: Antony Riakiotakis
Date:   Sat Apr 26 01:29:37 2014 +0300
https://developer.blender.org/rBe7ee56afe2c1a931e6037366e21671f3a4c1ab34

Merge branch 'master' into soc-2013-paint

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



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

diff --cc release/scripts/startup/bl_ui/space_image.py
index 956f893,f19e77e..36db45c
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@@ -478,10 -458,8 +478,9 @@@ class MASK_MT_editor_menus(Menu)
          sima = context.space_data
          ima = sima.image
  
-         show_render = sima.show_render
          show_uvedit = sima.show_uvedit
          show_maskedit = sima.show_maskedit
 +        show_paint = sima.show_paint
  
          layout.menu("IMAGE_MT_view")