[Bf-blender-cvs] [00f7dcd5be1] master: DRW: show clipping border for solid mode

[Campbell Barton]

Commit: 00f7dcd5be1fb32a65b5abccc09db6fec775c3cf
Author: Campbell Barton
Date:   Fri Mar 22 13:23:07 2019 +1100
Branches: master
https://developer.blender.org/rB00f7dcd5be1fb32a65b5abccc09db6fec775c3cf

DRW: show clipping border for solid mode

Solid + xray is still not supported.

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

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

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

diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c
index a31eb4963b8..89a47cb0dfe 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -370,8 +370,9 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
 		DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
 	}
 
-	/* TODO(campbell): displays but masks geometry, only use with wire for now. */
-	if ((wpd->shading.type == OB_WIRE) &&
+	/* TODO(campbell): displays but masks geometry,
+	 * only use with wire or solid-without-xray for now. */
+	if (((wpd->shading.type != OB_WIRE && XRAY_FLAG(wpd) == 0)) &&
 	    (draw_ctx->rv3d && (draw_ctx->rv3d->rflag & RV3D_CLIPPING) && draw_ctx->rv3d->clipbb))
 	{
 		psl->background_pass = DRW_pass_create(