[Bf-blender-cvs] [4f8b513] master: Fix T42168 mask texture UI missing. Own sillyness after last data fix commit.

[Antony Riakiotakis]

Commit: 4f8b513c1ae6b180bf1f8599fe67650936f6d5e5
Author: Antony Riakiotakis
Date:   Fri Oct 10 12:33:02 2014 +0200
Branches: master
https://developer.blender.org/rB4f8b513c1ae6b180bf1f8599fe67650936f6d5e5

Fix T42168 mask texture UI missing. Own sillyness after last data fix
commit.

If we include the data cleanup commit to an alpha version for 2.72a this
should be included as well

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

M	release/scripts/startup/bl_ui/space_view3d_toolbar.py

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

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 213bfd9..da64caa 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1272,7 +1272,7 @@ class VIEW3D_PT_tools_brush_texture(Panel, View3DPaintPanel):
         brush_texture_settings(col, brush, context.sculpt_object)
 
 
-class VIEW3D_PT_tools_mask_texture(View3DPanel, View3DPaintPanel):
+class VIEW3D_PT_tools_mask_texture(Panel, View3DPaintPanel):
     bl_category = "Tools"
     bl_context = "imagepaint"
     bl_label = "Texture Mask"
@@ -1281,7 +1281,7 @@ class VIEW3D_PT_tools_mask_texture(View3DPanel, View3DPaintPanel):
     @classmethod
     def poll(cls, context):
         settings = cls.paint_settings(context)
-        return (settings and settings.image_paint.brush and context.image_paint_object and brush)
+        return (settings and settings.brush and context.image_paint_object)
 
     def draw(self, context):
         layout = self.layout