[Bf-blender-cvs] [705015e0a42] master: Fix T78481: Workbench Shadow effects XRay

[Jeroen Bakker]

Commit: 705015e0a42c09ae503e42ebc592c9f04f097617
Author: Jeroen Bakker
Date:   Mon Jul 6 10:21:14 2020 +0200
Branches: master
https://developer.blender.org/rB705015e0a42c09ae503e42ebc592c9f04f097617

Fix T78481: Workbench Shadow effects XRay

When in XRay some effects (shadow, cavity & depth of field) aren't supported.
This patch makes sure that these effects aren't enabled.

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

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 7b08e97ac31..9e4d77429d5 100644
--- a/source/blender/draw/engines/workbench/workbench_data.c
+++ b/source/blender/draw/engines/workbench/workbench_data.c
@@ -256,6 +256,8 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd)
     }
     else if (XRAY_ENABLED(v3d)) {
       wpd->shading.xray_alpha = XRAY_ALPHA(v3d);
+      /* Disable shading options that aren't supported in transparency mode. */
+      wpd->shading.flag &= ~(V3D_SHADING_SHADOW | V3D_SHADING_CAVITY | V3D_SHADING_DEPTH_OF_FIELD);
     }
     else {
       wpd->shading.xray_alpha = 1.0f;