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_data.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_data.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_data.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index 04e1255521f..4b4bd74ae76 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -24,6 +24,8 @@ #include "DNA_userdef_types.h" +#include "ED_view3d.h" + #include "UI_resources.h" #include "GPU_batch.h" @@ -55,6 +57,7 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) wpd->shading = v3d->shading; wpd->use_color_render_settings = false; } + wpd->shading.xray_alpha = XRAY_ALPHA(v3d); wpd->use_color_management = BKE_scene_check_color_management_enabled(scene); |