[Bf-blender-cvs] [a761233261e] master: Correct last commit, wire xray is supported

Campbell Barton noreply at git.blender.org
Fri Jan 25 13:35:08 CET 2019


Commit: a761233261e2c393917a09d8fb59e27f87b4855a
Author: Campbell Barton
Date:   Fri Jan 25 23:36:31 2019 +1100
Branches: master
https://developer.blender.org/rBa761233261e2c393917a09d8fb59e27f87b4855a

Correct last commit, wire xray is 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 43230c723d3..ead9d51aaac 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -369,8 +369,10 @@ 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. */
-	if (0 && (draw_ctx->rv3d && (draw_ctx->rv3d->rflag & RV3D_CLIPPING) && draw_ctx->rv3d->clipbb)) {
+	/* TODO(campbell): displays but masks geometry, only use with wire for now. */
+	if ((wpd->shading.type == OB_WIRE) &&
+	    (draw_ctx->rv3d && (draw_ctx->rv3d->rflag & RV3D_CLIPPING) && draw_ctx->rv3d->clipbb))
+	{
 		psl->background_pass = DRW_pass_create(
 		        "Background", DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL);
 		GPUShader *shader = GPU_shader_get_builtin_shader(GPU_SHADER_3D_UNIFORM_COLOR_BACKGROUND);



More information about the Bf-blender-cvs mailing list