Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-10-10 14:33:02 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-10-10 14:33:02 +0400
commit4f8b513c1ae6b180bf1f8599fe67650936f6d5e5 (patch)
tree4df3f5da601d25db7bd6a200fcc98f4d1a2be006
parent585d2f31a9c438bddb63842b2f160236323e355b (diff)
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
-rw-r--r--release/scripts/startup/bl_ui/space_view3d_toolbar.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 213bfd9d808..da64caa7a30 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