From 43913fe21206d05e1ad9e8851c248efa4c093470 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Wed, 3 Jun 2015 11:33:33 +0200 Subject: Fix inconsistencies in texture paint UI T44929, T44927: * lock alpha only works in projective painting * fill threshold only works in 2D painting --- release/scripts/startup/bl_ui/properties_paint_common.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index b0da65063d1..cca142b645c 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -133,7 +133,7 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal else: row = col.row(align=True) panel.prop_unified_color(row, context, brush, "color", text="") - if brush.image_tool == 'FILL': + if brush.image_tool == 'FILL' and not projpaint: col.prop(brush, "fill_threshold") else: panel.prop_unified_color(row, context, brush, "secondary_color", text="") @@ -216,7 +216,9 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal col = layout.column(align=True) col.prop(brush, "use_accumulate") - col.prop(brush, "use_alpha") + if projpaint: + col.prop(brush, "use_alpha") + col.prop(brush, "use_gradient") col.separator() -- cgit v1.2.3