diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-07-01 18:59:47 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2020-07-13 18:13:17 +0300 |
| commit | f212a16c6ab5649d8685540c28c7b5b2ab3c1ed1 (patch) | |
| tree | ae9f29ac34f1b83a6c2352d912c0f7d124089a62 | |
| parent | 9f6c98534f6ad9b4b03bcfbd60179fdbc28c85fd (diff) | |
Fix T77655 Overlay: Edit mode + wire drawtype + infront not transparent
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_edit_mesh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_edit_mesh.c b/source/blender/draw/engines/overlay/overlay_edit_mesh.c index 7fc1a7fdce6..fd872108b00 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_mesh.c +++ b/source/blender/draw/engines/overlay/overlay_edit_mesh.c @@ -269,6 +269,7 @@ void OVERLAY_edit_mesh_cache_populate(OVERLAY_Data *vedata, Object *ob) OVERLAY_PrivateData *pd = vedata->stl->pd; struct GPUBatch *geom = NULL; + bool draw_as_solid = (ob->dt > OB_WIRE); bool do_in_front = (ob->dtx & OB_DRAWXRAY) != 0; bool do_occlude_wire = (pd->edit_mesh.flag & V3D_OVERLAY_EDIT_OCCLUDE_WIRE) != 0; bool do_show_mesh_analysis = (pd->edit_mesh.flag & V3D_OVERLAY_EDIT_STATVIS) != 0; @@ -283,7 +284,7 @@ void OVERLAY_edit_mesh_cache_populate(OVERLAY_Data *vedata, Object *ob) } } - if (do_occlude_wire || do_in_front) { + if (do_occlude_wire || (do_in_front && draw_as_solid)) { geom = DRW_cache_mesh_surface_get(ob); DRW_shgroup_call_no_cull(pd->edit_mesh_depth_grp[do_in_front], geom, ob); } |