Wireframe Mode: Fix missing wireframe if overlays are disabled

2 files changed, 13 insertions, 0 deletions

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 36c2497291f..b637d2fe140 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1300,6 +1300,10 @@ static void drw_engines_enable(ViewLayer *view_layer, RenderEngineType *engine_t
 		drw_engines_enable_from_mode(mode);
 	}
 	else {
+		/* Force enable overlays engine for wireframe mode */
+		if (v3d->shading.type == OB_WIRE) {
+			drw_engines_enable_from_overlays(v3d->overlay.flag);
+		}
 		/* if gpencil must draw the strokes, but not the object */
 		drw_engines_enable_from_mode(mode);
 	}
diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c
index 53934de9d0e..b28e400055e 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -165,6 +165,15 @@ static void overlay_cache_init(void *vedata)
 		stl->g_data->show_overlays = false;
 	}
 
+	if (stl->g_data->show_overlays == false) {
+		stl->g_data->overlay.flag = 0;
+	}
+
+	if (v3d->shading.type == OB_WIRE) {
+		stl->g_data->overlay.flag |= V3D_OVERLAY_WIREFRAMES;
+		stl->g_data->show_overlays = true;
+	}
+
 	{
 		/* Face Orientation Pass */
 		DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_BLEND;