diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-07-01 23:29:16 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-07-01 23:29:16 +0300 |
| commit | 2002b29ecd2b8fff6f1320fa194f8d7525bf9b2e (patch) | |
| tree | ee226fbed4cafce9e9d97aa1c7db9b47f4a29bda /source/blender/draw/engines/workbench/workbench_forward.c | |
| parent | c2a762c8e6e529a36b0e8cff5ac9339e084829b4 (diff) | |
Workbench: Combine Xray Alpha with object/material alpha ...
... instead of overiding it (previous behavior).
In practice it's not really noticeable.
This means an object with alpha will never be more opaque when enabling
xray.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_forward.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_forward.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index 612a3901ca0..9245d13eab0 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -178,7 +178,7 @@ WORKBENCH_MaterialData *workbench_forward_get_or_create_material_data(WORKBENCH_ wpd->transparent_accum_uniform_sh, psl->transparent_accum_pass); DRW_shgroup_uniform_block(grp, "world_block", wpd->world_ubo); - DRW_shgroup_uniform_float_copy(grp, "alpha", wpd->shading.xray_alpha); + DRW_shgroup_uniform_float_copy(grp, "alpha", material_template.alpha); DRW_shgroup_uniform_vec4(grp, "viewvecs[0]", (float *)wpd->viewvecs, 3); workbench_material_copy(material, &material_template); if (STUDIOLIGHT_TYPE_MATCAP_ENABLED(wpd)) { |