diff options
author | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
commit | 889c4ca9c26d770af02cedef972d65eb173bdb5e (patch) | |
tree | 6f46156146db1b3f09d92c6eaa1f44ba8a584ed4 /source/blender/draw/engines/workbench/workbench_transparent.c | |
parent | 87df15190210eb84ef52e5dccc2932918f912da5 (diff) | |
parent | 0829cebeb024095c268f190c34daa8ae9a5a224c (diff) |
Merge branch 'asset-uuid--archived' into asset-engine--archivedasset-engine--archived
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_transparent.c')
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_transparent.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_transparent.c b/source/blender/draw/engines/workbench/workbench_transparent.c index 5fd8229304a..1c40a350300 100644 --- a/source/blender/draw/engines/workbench/workbench_transparent.c +++ b/source/blender/draw/engines/workbench/workbench_transparent.c @@ -157,7 +157,7 @@ void workbench_transparent_draw_depth_pass(WORKBENCH_Data *data) WORKBENCH_FramebufferList *fbl = data->fbl; WORKBENCH_PassList *psl = data->psl; - const bool do_xray_depth_pass = XRAY_ALPHA(wpd) > 0.0f; + const bool do_xray_depth_pass = !XRAY_FLAG_ENABLED(wpd) || XRAY_ALPHA(wpd) > 0.0f; const bool do_transparent_depth_pass = psl->outline_ps || wpd->dof_enabled || do_xray_depth_pass; if (do_transparent_depth_pass) { @@ -165,14 +165,14 @@ void workbench_transparent_draw_depth_pass(WORKBENCH_Data *data) if (!DRW_pass_is_empty(psl->transp_accum_ps)) { GPU_framebuffer_bind(fbl->opaque_fb); - /* TODO(fclem) Disable writting to first two buffers. Unecessary waste of bandwidth. */ + /* TODO(fclem) Disable writing to first two buffers. Unnecessary waste of bandwidth. */ DRW_pass_state_set(psl->transp_accum_ps, state | wpd->cull_state | wpd->clip_state); DRW_draw_pass(psl->transp_accum_ps); } if (!DRW_pass_is_empty(psl->transp_accum_infront_ps)) { GPU_framebuffer_bind(fbl->opaque_infront_fb); - /* TODO(fclem) Disable writting to first two buffers. Unecessary waste of bandwidth. */ + /* TODO(fclem) Disable writing to first two buffers. Unnecessary waste of bandwidth. */ DRW_pass_state_set(psl->transp_accum_infront_ps, state | wpd->cull_state | wpd->clip_state); DRW_draw_pass(psl->transp_accum_infront_ps); } |