[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60141] branches/soc-2013-paint/release/ scripts/startup/bl_ui/space_view3d_toolbar.py: blend mode menu not available after changing to erase and add alpha mode, reported by LightBWK, thanks

[Antony Riakiotakis]

Revision: 60141
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60141
Author:   psy-fi
Date:     2013-09-14 20:09:00 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
blend mode menu not available after changing to erase and add alpha mode, reported by LightBWK, thanks

Modified Paths:
--------------
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py

Modified: branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-09-14 12:11:26 UTC (rev 60140)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-09-14 20:09:00 UTC (rev 60141)
@@ -754,16 +754,15 @@
                         col.prop(brush, "secondary_color", text="")
                         col.operator("paint.brush_colors_flip", icon='FILE_REFRESH')
 
-                col.prop(brush, "blend", text="Blend")
-
                 col = layout.column()
-                col.active = (brush.blend not in {'ERASE_ALPHA', 'ADD_ALPHA'})
                 col.prop(brush, "use_alpha")
 
                 col = layout.column()
                 col.template_ID(settings, "palette", new="palette.new")
                 if settings.palette:
                     col.template_palette(settings, "palette", color=True)      
+
+            col.prop(brush, "blend", text="Blend")
                           
             col = layout.column()
             row = col.row(align=True)