diff options
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_forward.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index 5f15fb3f19e..6b1982151cf 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -431,7 +431,7 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata) noise_offset = fmodf(noise_offset + 1.0f / 8.0f, 1.0f); } - if (XRAY_FLAG_ENABLED(wpd)) { + if (XRAY_ENABLED(wpd)) { blend_threshold = 1.0f - XRAY_ALPHA(wpd) * 0.9f; } diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index 081590bb003..afe735ec7f5 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -701,7 +701,7 @@ static void EDIT_MESH_cache_populate(void *vedata, Object *ob) DRW_shgroup_call(g_data->fweights_shgrp, geom, ob->obmat); } - if (do_show_mesh_analysis) { + if (do_show_mesh_analysis && !XRAY_ACTIVE(v3d)) { Mesh *me = (Mesh *)ob->data; BMEditMesh *embm = me->edit_mesh; const bool is_original = embm->mesh_eval_final && |