From 5f49f818d6282a2f421f454bb32b2a6b2c9a0a0d Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Tue, 13 Oct 2020 15:33:03 +0200 Subject: Fixes T81670: Sculpt paint vertex colors brush does not switch to secondary color using CTRL This was just not implemented. Now make this consistent with vertexpainting / texturepainting. Maniphest Tasks: T81670 Differential Revision: https://developer.blender.org/D9195 --- source/blender/editors/sculpt_paint/sculpt_paint_color.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/sculpt_paint/sculpt_paint_color.c') diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_color.c b/source/blender/editors/sculpt_paint/sculpt_paint_color.c index 000b7afdf55..f0047448a8d 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_color.c +++ b/source/blender/editors/sculpt_paint/sculpt_paint_color.c @@ -133,7 +133,9 @@ static void do_paint_brush_task_cb_ex(void *__restrict userdata, const int thread_id = BLI_task_parallel_thread_id(tls); float brush_color[4] = {0.0f, 0.0f, 0.0f, 1.0f}; - copy_v3_v3(brush_color, BKE_brush_color_get(ss->scene, brush)); + copy_v3_v3(brush_color, + ss->cache->invert ? BKE_brush_secondary_color_get(ss->scene, brush) : + BKE_brush_color_get(ss->scene, brush)); IMB_colormanagement_srgb_to_scene_linear_v3(brush_color); BKE_pbvh_vertex_iter_begin(ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE) -- cgit v1.2.3