[Bf-blender-cvs] [43913fe] master: Fix inconsistencies in texture paint UI T44929, T44927:

[Antony Riakiotakis]

Commit: 43913fe21206d05e1ad9e8851c248efa4c093470
Author: Antony Riakiotakis
Date:   Wed Jun 3 11:33:33 2015 +0200
Branches: master
https://developer.blender.org/rB43913fe21206d05e1ad9e8851c248efa4c093470

Fix inconsistencies in texture paint UI T44929, T44927:

* lock alpha only works in projective painting
* fill threshold only works in 2D painting

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

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 b0da650..cca142b 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()