From 4dd32f94aa3edb56130f15019b9b2724c3ba8a28 Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Wed, 14 Apr 2021 19:00:18 +0200 Subject: GPencil: Invert color offsetting for Single and Object mode Now, instead to offset the stroke color to make it visible over fill, the stroke keeps the original color and the fill is offset. Related to the issue in T87406. --- source/blender/draw/engines/gpencil/gpencil_draw_data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/draw') diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_data.c b/source/blender/draw/engines/gpencil/gpencil_draw_data.c index 99946b27dcd..526f553329e 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_data.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_data.c @@ -151,7 +151,7 @@ static MaterialGPencilStyle *gpencil_viewport_material_overrides( gp_style->fill_rgba[3] = 1.0f; copy_v4_v4(gp_style->stroke_rgba, gp_style->fill_rgba); if (lighting_mode != V3D_LIGHTING_FLAT) { - gpencil_shade_color(gp_style->stroke_rgba); + gpencil_shade_color(gp_style->fill_rgba); } break; case V3D_SHADING_OBJECT_COLOR: @@ -161,7 +161,7 @@ static MaterialGPencilStyle *gpencil_viewport_material_overrides( copy_v4_v4(gp_style->fill_rgba, ob->color); copy_v4_v4(gp_style->stroke_rgba, ob->color); if (lighting_mode != V3D_LIGHTING_FLAT) { - gpencil_shade_color(gp_style->stroke_rgba); + gpencil_shade_color(gp_style->fill_rgba); } break; case V3D_SHADING_VERTEX_COLOR: -- cgit v1.2.3