[Bf-blender-cvs] [03e0fd289dd] blender2.8: Fix top bar unified color & image paint brush

[Campbell Barton]

Commit: 03e0fd289dd970a82848a1921fe216c166857a03
Author: Campbell Barton
Date:   Thu Oct 25 09:53:22 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB03e0fd289dd970a82848a1921fe216c166857a03

Fix top bar unified color & image paint brush

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 9fdc7143d11..ccc96ed2ebb 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -229,13 +229,13 @@ class _draw_left_context_mode:
         def PAINT_TEXTURE(context, layout, tool):
             if (tool is None) or (not tool.has_datablock):
                 return
-            brush = context.tool_settings.vertex_paint.brush
+            brush = context.tool_settings.image_paint.brush
             if brush is None:
                 return
 
             from .properties_paint_common import UnifiedPaintPanel
 
-            layout.prop(brush, "color", text="")
+            UnifiedPaintPanel.prop_unified_color(layout, context, brush, "color", text="")
             UnifiedPaintPanel.prop_unified_size(layout, context, brush, "size", slider=True, text="Radius")
             UnifiedPaintPanel.prop_unified_strength(layout, context, brush, "strength", slider=True, text="Strength")
 
@@ -248,7 +248,7 @@ class _draw_left_context_mode:
 
             from .properties_paint_common import UnifiedPaintPanel
 
-            layout.prop(brush, "color", text="")
+            UnifiedPaintPanel.prop_unified_color(layout, context, brush, "color", text="")
             UnifiedPaintPanel.prop_unified_size(layout, context, brush, "size", slider=True, text="Radius")
             UnifiedPaintPanel.prop_unified_strength(layout, context, brush, "strength", slider=True, text="Strength")