From a5976f4ae91869e484c6d3fa418ca0a1086df92d Mon Sep 17 00:00:00 2001 From: Falk David <falk@blender.org> Date: Fri, 6 Dec 2024 10:38:57 +0100 Subject: [PATCH] Fix #130651: Tint tool does not show correct color in header The issue was that the UI code still used the unified paint settings. It was decided that in `PAINT_GREASE_PENCIL` mode we don't use the unified paint settings and always use the settings on the brush. The fix uses the `brush` as the owner of the `color` property instead of the unified paint settings. Pull Request: https://projects.blender.org/blender/blender/pulls/131452 --- scripts/startup/bl_ui/space_view3d.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index d5d4a36dade..628e1fdf8b3 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -658,9 +658,7 @@ class _draw_tool_settings_context_mode: if grease_pencil_tool == 'TINT': row.separator(factor=0.4) - ups = context.tool_settings.unified_paint_settings - prop_owner = ups if ups.use_unified_color else brush - row.prop_with_popover(prop_owner, "color", text="", panel="TOPBAR_PT_grease_pencil_vertex_color") + row.prop_with_popover(brush, "color", text="", panel="TOPBAR_PT_grease_pencil_vertex_color") from bl_ui.properties_paint_common import ( brush_basic_grease_pencil_paint_settings, -- GitLab