From 1406b9e6563d9e6bd3187e267c1655cedcb06cf2 Mon Sep 17 00:00:00 2001 From: Miguel Pozo Date: Thu, 16 Jan 2025 17:14:22 +0100 Subject: [PATCH] Fix #133073: Overlay-Next: Meshes without UVs crashes the UV Editor Add missing check for has_active_edit_uvmap. --- .../blender/draw/engines/overlay/overlay_next_mesh.hh | 11 +++++++++-- 1 file changed, 9 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 d2372c337b9..801c2919020 100644 --- a/source/blender/draw/engines/overlay/overlay_next_mesh.hh +++ b/source/blender/draw/engines/overlay/overlay_next_mesh.hh @@ -715,11 +715,18 @@ class MeshUVs : Overlay { return; } - ResourceHandle res_handle = manager.unique_handle(ob_ref); - Object &ob = *ob_ref.object; Mesh &mesh = *static_cast(ob.data); + const bool has_active_edit_uvmap = + (CustomData_get_active_layer(&mesh.runtime->edit_mesh->bm->ldata, CD_PROP_FLOAT2) != -1); + + if (!has_active_edit_uvmap) { + return; + } + + ResourceHandle res_handle = manager.unique_handle(ob_ref); + if (show_uv_edit) { gpu::Batch *geom = DRW_mesh_batch_cache_get_edituv_edges(ob, mesh); edges_ps_.draw_expand(geom, GPU_PRIM_TRIS, 2, 1, res_handle);