From 514c449a549662a29507f3a3d1eaabd7e216ea94 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Sun, 31 Mar 2013 11:04:13 +0000 Subject: UI cleanup: * Using masking is determined only by the presence of the texture, remove extraneous DNA flag (might cause issues later but in practice brush options are not harmful) * Overlay and angle sliders are active during stencil mapped brushes * Only draw the overlay if there's a texture. --- release/scripts/startup/bl_ui/space_image.py | 5 ----- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 5 ----- 2 files changed, 10 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 488f2bddd90..3537ca62d93 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -739,11 +739,6 @@ class IMAGE_PT_tools_mask_texture(BrushButtonsPanel, Panel): bl_label = "Texture Mask" bl_options = {'DEFAULT_CLOSED'} - def draw_header(self, context): - brush = context.tool_settings.image_paint.brush - tex_slot_alpha = brush.mask_texture_slot - self.layout.prop(brush, 'use_mask', text="") - def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index efeb4ff0f1c..aa90b093c26 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -779,11 +779,6 @@ class VIEW3D_PT_tools_mask_texture(View3DPanel, Panel): brush = context.tool_settings.image_paint.brush return (context.image_paint_object and brush and brush.image_tool != 'SOFTEN') - def draw_header(self, context): - brush = context.tool_settings.image_paint.brush - tex_slot_alpha = brush.mask_texture_slot - self.layout.prop(brush, 'use_mask', text="") - def draw(self, context): layout = self.layout -- cgit v1.2.3