From 8f63f509b6df5faee23f78ff1cc8f385cc612ab0 Mon Sep 17 00:00:00 2001 From: Miguel Pozo Date: Mon, 31 Mar 2025 17:37:00 +0200 Subject: [PATCH] Fix #136501: Overlay: Edit Mode Edges occluded by viewport grid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Render Overlay Meshes after the Grid. As a side effect, in-front wireframe objects are now displayed behind non-in-front edit mode overlays. Co-authored-by: Clément Foucault Pull Request: https://projects.blender.org/blender/blender/pulls/136764 --- .../blender/draw/engines/overlay/overlay_next_instance.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/blender/draw/engines/overlay/overlay_next_instance.cc b/source/blender/draw/engines/overlay/overlay_next_instance.cc index 6fff3b447d7..8a44803e218 100644 --- a/source/blender/draw/engines/overlay/overlay_next_instance.cc +++ b/source/blender/draw/engines/overlay/overlay_next_instance.cc @@ -805,7 +805,8 @@ void Instance::draw_v3d(Manager &manager, View &view) layer.armatures.draw_line(framebuffer, manager, view); layer.sculpts.draw_line(framebuffer, manager, view); layer.grease_pencil.draw_line(framebuffer, manager, view); - layer.meshes.draw_line(framebuffer, manager, view); + /* NOTE: Temporarily moved after grid drawing (See #136764). */ + // layer.meshes.draw_line(framebuffer, manager, view); layer.curves.draw_line(framebuffer, manager, view); }; @@ -890,6 +891,9 @@ void Instance::draw_v3d(Manager &manager, View &view) xray_fade.draw_color_only(resources.overlay_color_only_fb, manager, view); grid.draw_color_only(resources.overlay_color_only_fb, manager, view); + regular.meshes.draw_line(resources.overlay_line_fb, manager, view); + infront.meshes.draw_line(resources.overlay_line_in_front_fb, manager, view); + draw_color_only(regular, resources.overlay_color_only_fb); draw_color_only(infront, resources.overlay_color_only_fb);