From f37733332614e9ba4d2978998eb153fbefcfdba2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 29 Oct 2024 22:02:38 +1100 Subject: [PATCH] Fix #129503: unwrap with subsurf at level 1 disconnects triangles Ref !129501 --- source/blender/editors/uvedit/uvedit_unwrap_ops.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc index 42db6c2dafe..7b1f74a4e89 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc @@ -810,8 +810,13 @@ static Mesh *subdivide_edit_mesh(const Object *object, BKE_mesh_ensure_default_orig_index_customdata(me_from_em); bke::subdiv::Settings settings = BKE_subsurf_modifier_settings_init(smd, false); + /* A zero level must be prevented by #modifier_unwrap_state + * since necessary data won't be available, see: #128958. */ + BLI_assert(settings.level > 0); + + /* Level 1 causes disconnected triangles, force level 2 to prevent this, see: #129503. */ if (settings.level == 1) { - return me_from_em; + settings.level = 2; } bke::subdiv::ToMeshSettings mesh_settings;