[Bf-blender-cvs] [29c8c6cf4f8] blender2.8: Fix T56940: crash rendering with OpenGL as engine.

[Brecht Van Lommel]

Commit: 29c8c6cf4f8a6d1af19e9c14517928388ed4926a
Author: Brecht Van Lommel
Date:   Fri Sep 28 10:39:20 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB29c8c6cf4f8a6d1af19e9c14517928388ed4926a

Fix T56940: crash rendering with OpenGL as engine.

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

M	source/blender/draw/engines/workbench/workbench_forward.c
M	source/blender/draw/engines/workbench/workbench_render.c

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

diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c
index ca8f06ce146..0d4329c9699 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -365,11 +365,11 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
 	{
 		float blend_threshold = 0.0f;
 
-		if (draw_ctx->v3d->shading.flag & XRAY_FLAG(draw_ctx->v3d)) {
+		if (wpd->shading.flag & XRAY_FLAG(wpd)) {
 			blend_threshold = 0.75f - XRAY_ALPHA(wpd) * 0.5f;
 		}
 
-		if (draw_ctx->v3d->shading.type == OB_WIRE) {
+		if (wpd->shading.type == OB_WIRE) {
 			wpd->shading.xray_alpha = 0.0f;
 			wpd->shading.xray_alpha_wire = 0.0f;
 		}
diff --git a/source/blender/draw/engines/workbench/workbench_render.c b/source/blender/draw/engines/workbench/workbench_render.c
index 67059dae861..9a3efa97935 100644
--- a/source/blender/draw/engines/workbench/workbench_render.c
+++ b/source/blender/draw/engines/workbench/workbench_render.c
@@ -137,7 +137,7 @@ void workbench_render(WORKBENCH_Data *data, RenderEngine *engine, RenderLayer *r
 		return;
 	}
 
-	const bool deferred = (scene->display.shading.flag & XRAY_FLAG(draw_ctx->v3d)) == 0;
+	const bool deferred = (scene->display.shading.flag & XRAY_FLAG(&scene->display)) == 0;
 
 	if (deferred) {
 		/* Init engine. */