Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-10-25 01:53:22 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-10-25 01:54:18 +0300
commit03e0fd289dd970a82848a1921fe216c166857a03 (patch)
tree71699e962a6f439c072063e61dda147cef108a0f /release/scripts/startup/bl_ui/space_topbar.py
parent40825022399a2966cf39d8f6bca6cc3ce7f270cc (diff)
Fix top bar unified color & image paint brush
Diffstat (limited to 'release/scripts/startup/bl_ui/space_topbar.py')
-rw-r--r--release/scripts/startup/bl_ui/space_topbar.py6
1 files changed, 3 insertions, 3 deletions
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")