[Bf-blender-cvs] [5314b79] blender-v2.72-release: Fix T42168 mask texture UI missing. Own sillyness after last data fix commit.

[Antony Riakiotakis]

Commit: 5314b797e0c1383fd0c5c09ca5b7bdfa728f3b1f
Author: Antony Riakiotakis
Date:   Fri Oct 10 12:33:02 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rB5314b797e0c1383fd0c5c09ca5b7bdfa728f3b1f

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 dea7f33..d9a32e2 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1271,7 +1271,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"
@@ -1280,7 +1280,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