[Bf-blender-cvs] [ce5477d9939] master: Fix T68802: Paint brush's Fill Threshold option is lost

[William Reynish]

Commit: ce5477d99392ce412dc0e669a5d9bf163a944d96
Author: William Reynish
Date:   Mon Aug 19 13:28:09 2019 +0200
Branches: master
https://developer.blender.org/rBce5477d99392ce412dc0e669a5d9bf163a944d96

Fix T68802: Paint brush's Fill Threshold option is lost

===================================================================

M	release/scripts/startup/bl_ui/properties_paint_common.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 9e1a642d891..23b2556eddb 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -113,10 +113,8 @@ def brush_texpaint_common(panel, context, layout, brush, _settings, projpaint=Fa
 
     col = layout.column()
 
-    if capabilities.has_color:
-        if brush.blend in {'ERASE_ALPHA', 'ADD_ALPHA'}:
-            if brush.image_tool == 'FILL' and not projpaint:
-                col.prop(brush, "fill_threshold")
+    if brush.image_tool == 'FILL' and not projpaint:
+        col.prop(brush, "fill_threshold", text="Gradient Type", slider=True)
 
     elif brush.image_tool == 'SOFTEN':
         col.row().prop(brush, "direction", expand=True)
@@ -183,7 +181,7 @@ def brush_texpaint_common_gradient(_panel, context, layout, brush, _settings, pr
 
     if brush.image_tool == 'DRAW':
         UnifiedPaintPanel.prop_unified_color(col, context, brush, "secondary_color", text="Background Color")
-        col.prop(brush, "gradient_stroke_mode", text="Mode")
+        col.prop(brush, "gradient_stroke_mode", text="Gradient Mapping")
         if brush.gradient_stroke_mode in {'SPACING_REPEAT', 'SPACING_CLAMP'}:
             col.prop(brush, "grad_spacing")
     else:  # if brush.image_tool == 'FILL':