From 470cdeeae037c85d3b302e2b1cb5868e02e2bb59 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 8 May 2020 15:44:15 +0200 Subject: Fix Assert: Wireframe XRay during Sculpting In the situation that the viewport was set to solid/texture mode and switch to wireframe and sculpt mode, an assert was triggered in `workbench_cache_sculpt_populate`. --- source/blender/draw/engines/workbench/workbench_data.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/draw/engines/workbench') diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index 2e8119fca2f..7b08e97ac31 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -250,6 +250,8 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) wpd->shading = v3d->shading; if (wpd->shading.type < OB_SOLID) { + wpd->shading.light = V3D_LIGHTING_FLAT; + wpd->shading.color_type = V3D_SHADING_OBJECT_COLOR; wpd->shading.xray_alpha = 0.0f; } else if (XRAY_ENABLED(v3d)) { -- cgit v1.2.3