[Bf-blender-cvs] [470cdeeae03] master: Fix Assert: Wireframe XRay during Sculpting

[Jeroen Bakker]

Commit: 470cdeeae037c85d3b302e2b1cb5868e02e2bb59
Author: Jeroen Bakker
Date:   Fri May 8 15:44:15 2020 +0200
Branches: master
https://developer.blender.org/rB470cdeeae037c85d3b302e2b1cb5868e02e2bb59

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`.

===================================================================

M	source/blender/draw/engines/workbench/workbench_data.c

===================================================================

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)) {