From 6ceefe4f23b831998dbb34273cc0639cf44d4f6a Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 19 Mar 2024 14:25:54 +0100 Subject: [PATCH] Revert "Fix #119527: Aliased Wireframe In XRay" This fix should only be committed to blender-v4.1-release branch Blender 4.2 the pos/nor buffers are separated and doesn't lead to drawing artifacts. This reverts commit 02379f3200f52fd51635e6e247bc2e944f0a0d4d --- source/blender/draw/engines/overlay/overlay_wireframe.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.cc b/source/blender/draw/engines/overlay/overlay_wireframe.cc index 9dc7e9d7fe2..e77e319bb99 100644 --- a/source/blender/draw/engines/overlay/overlay_wireframe.cc +++ b/source/blender/draw/engines/overlay/overlay_wireframe.cc @@ -66,7 +66,8 @@ void OVERLAY_wireframe_cache_init(OVERLAY_Data *vedata) const bool use_select = (DRW_state_is_select() || DRW_state_is_depth()); GPUShader *wires_sh = use_select ? OVERLAY_shader_wireframe_select() : - OVERLAY_shader_wireframe(pd->antialiasing.enabled); + OVERLAY_shader_wireframe(pd->antialiasing.enabled && + !pd->xray_enabled); for (int xray = 0; xray < (is_material_shmode ? 1 : 2); xray++) { DRWState state = DRW_STATE_FIRST_VERTEX_CONVENTION | DRW_STATE_WRITE_COLOR |