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
committerSergey Sharybin <sergey.vfx@gmail.com>2014-10-15 15:06:11 +0400
commit5314b797e0c1383fd0c5c09ca5b7bdfa728f3b1f (patch)
tree1ab36d39a4a1b555ab7612cb35f1158d56cf5eab
parent6095c9db9fade934ba40558f5177a4f5752aabd5 (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 dea7f3399ad..d9a32e24859 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