From 12476d157a240aec48cee4ddb648701fb2ba188e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 1 May 2013 03:28:14 +0000 Subject: Fix projection paint clone/soften/smear no longer working with textures, Moved the code after the masking check so we can skip the texture lookup if the pixel is done, is a bit faster. Also hide the color wheel for these tools, only did it for 2D paint in previous commit. --- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 6be5c0e6e04..2042dc148de 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -687,8 +687,10 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): elif context.image_paint_object and brush: col = layout.column() - col.template_color_picker(brush, "color", value_slider=True) - col.prop(brush, "color", text="") + + if brush.image_tool == 'DRAW' and brush.blend not in ('ERASE_ALPHA', 'ADD_ALPHA'): + col.template_color_picker(brush, "color", value_slider=True) + col.prop(brush, "color", text="") row = col.row(align=True) self.prop_unified_size(row, context, brush, "size", slider=True, text="Radius") @@ -825,7 +827,7 @@ class VIEW3D_PT_tools_mask_texture(View3DPanel, Panel): @classmethod def poll(cls, context): brush = context.tool_settings.image_paint.brush - return (context.image_paint_object and brush and brush.image_tool != 'SOFTEN') + return (context.image_paint_object and brush) def draw(self, context): layout = self.layout -- cgit v1.2.3