From 2abc3ad80144bf777a67ddaaca393b1f6a2ac651 Mon Sep 17 00:00:00 2001 From: Miguel Pozo Date: Mon, 13 Jan 2025 17:47:35 +0100 Subject: [PATCH] Fix #132056, #132057, #132666: Overlay-Next: X-Ray Take xray_enabled into account for prepasses. Fix #132056 Fix #132057 Fix #132666 --- source/blender/draw/engines/overlay/overlay_next_mesh.hh | 2 +- source/blender/draw/engines/overlay/overlay_next_prepass.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/draw/engines/overlay/overlay_next_mesh.hh b/source/blender/draw/engines/overlay/overlay_next_mesh.hh index e264bbabe6b..33173350e6f 100644 --- a/source/blender/draw/engines/overlay/overlay_next_mesh.hh +++ b/source/blender/draw/engines/overlay/overlay_next_mesh.hh @@ -290,7 +290,7 @@ class Meshes : Overlay { /* WORKAROUND: GPU subdiv uses a different normal format. Remove this once GPU subdiv is * refactored. */ const bool use_gpu_subdiv = BKE_subsurf_modifier_has_gpu_subdiv(static_cast(ob->data)); - const bool draw_as_solid = (ob->dt > OB_WIRE); + const bool draw_as_solid = (ob->dt > OB_WIRE) && !state.xray_enabled; if (show_retopology_) { gpu::Batch *geom = DRW_mesh_batch_cache_get_edit_triangles(mesh); diff --git a/source/blender/draw/engines/overlay/overlay_next_prepass.hh b/source/blender/draw/engines/overlay/overlay_next_prepass.hh index b2132ed774f..b60aa526c6b 100644 --- a/source/blender/draw/engines/overlay/overlay_next_prepass.hh +++ b/source/blender/draw/engines/overlay/overlay_next_prepass.hh @@ -72,7 +72,7 @@ class Prepass : Overlay { public: void begin_sync(Resources &res, const State &state) final { - enabled_ = state.is_space_v3d(); + enabled_ = state.is_space_v3d() && !state.xray_enabled; if (!enabled_) { /* Not used. But release the data. */