griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #130751: Overlay Next: Selected Outline highlight vanishes when face orientation enabled

Browse Source 
Was caused by different drawing order. Use the legacy drawing order
until we find a better fix.

The better fix would be to render outline with depth.
This commit is contained in:
Clément Foucault
2024-11-28 19:16:32 +01:00
parent 4deecd97a9
commit 5982b5e75c
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/draw/engines/overlay/overlay_next_instance.cc
View File

@@ -445,7 +445,8 @@ void Instance::draw_v3d(Manager &manager, View &view)
float4 clear_color(0.0f);
auto draw = [&](OverlayLayer &layer, Framebuffer &framebuffer) {
layer.facing.draw(framebuffer, manager, view);
/* TODO(fclem): Depth aware outlines (see #130751). */
// layer.facing.draw(framebuffer, manager, view);
layer.fade.draw(framebuffer, manager, view);
layer.mode_transfer.draw(framebuffer, manager, view);
layer.edit_text.draw(framebuffer, manager, view);
@@ -524,6 +525,12 @@ void Instance::draw_v3d(Manager &manager, View &view)
infront.wireframe.copy_depth(resources.depth_target_in_front_tx);
}
{
/* TODO(fclem): This is really bad for performance as the outline pass will then split the
* render pass and do a framebuffer switch. This also only fix the issue for non-infront
* objects.
* We need to figure a way to merge the outline with correct depth awareness (see #130751). */
regular.facing.draw(resources.overlay_fb, manager, view);
/* Line only pass. */
outline.draw_line_only_ex(resources.overlay_line_only_fb, resources, manager, view);
}
@@ -532,6 +539,9 @@ void Instance::draw_v3d(Manager &manager, View &view)
draw(regular, resources.overlay_fb);
draw_line(regular, resources.overlay_line_fb);
/* Here because of custom order of regular.facing. */
infront.facing.draw(resources.overlay_fb, manager, view);
draw(infront, resources.overlay_in_front_fb);
draw_line(infront, resources.overlay_line_in_front_fb);
}