From c8bf6b2c8fcada16267c75e33a5432f2eb78e98f Mon Sep 17 00:00:00 2001 From: Amulopapa67 <125805652+Amulopapa67@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:53:54 +0800 Subject: [PATCH 1/2] fix uv select with Edge Selection and UV Sync --- source/blender/bmesh/intern/bmesh_marking.cc | 30 +++++++++----------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/source/blender/bmesh/intern/bmesh_marking.cc b/source/blender/bmesh/intern/bmesh_marking.cc index 38698736a57..eff48387596 100644 --- a/source/blender/bmesh/intern/bmesh_marking.cc +++ b/source/blender/bmesh/intern/bmesh_marking.cc @@ -484,31 +484,29 @@ void BM_mesh_select_flush(BMesh *bm) bool ok; BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) { - if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) && BM_elem_flag_test(e->v2, BM_ELEM_SELECT) && - !BM_elem_flag_test(e, BM_ELEM_HIDDEN)) - { - BM_elem_flag_enable(e, BM_ELEM_SELECT); + if (BM_elem_flag_test(e, BM_ELEM_SELECT) && !BM_elem_flag_test(e, BM_ELEM_HIDDEN)) { + BM_elem_flag_enable(e, BM_ELEM_SELECT); } - } - BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { +} +BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { ok = true; if (!BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { - l_iter = l_first = BM_FACE_FIRST_LOOP(f); - do { - if (!BM_elem_flag_test(l_iter->v, BM_ELEM_SELECT)) { - ok = false; - break; - } - } while ((l_iter = l_iter->next) != l_first); + l_iter = l_first = BM_FACE_FIRST_LOOP(f); + do { + if (!BM_elem_flag_test(l_iter->e, BM_ELEM_SELECT)) { + ok = false; + break; + } + } while ((l_iter = l_iter->next) != l_first); } else { - ok = false; + ok = false; } if (ok) { - BM_elem_flag_enable(f, BM_ELEM_SELECT); + BM_elem_flag_enable(f, BM_ELEM_SELECT); } - } +} recount_totsels(bm); } -- 2.30.2 From b11fbd28478b1ca08afdf00d8ba90dd459f84118 Mon Sep 17 00:00:00 2001 From: Amulopapa67 <125805652+Amulopapa67@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:15:55 +0800 Subject: [PATCH 2/2] using clang-format --- source/blender/bmesh/intern/bmesh_marking.cc | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/source/blender/bmesh/intern/bmesh_marking.cc b/source/blender/bmesh/intern/bmesh_marking.cc index eff48387596..04704d0bc52 100644 --- a/source/blender/bmesh/intern/bmesh_marking.cc +++ b/source/blender/bmesh/intern/bmesh_marking.cc @@ -485,28 +485,28 @@ void BM_mesh_select_flush(BMesh *bm) BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_SELECT) && !BM_elem_flag_test(e, BM_ELEM_HIDDEN)) { - BM_elem_flag_enable(e, BM_ELEM_SELECT); + BM_elem_flag_enable(e, BM_ELEM_SELECT); } -} -BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { + } + BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { ok = true; if (!BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { - l_iter = l_first = BM_FACE_FIRST_LOOP(f); - do { - if (!BM_elem_flag_test(l_iter->e, BM_ELEM_SELECT)) { - ok = false; - break; - } - } while ((l_iter = l_iter->next) != l_first); + l_iter = l_first = BM_FACE_FIRST_LOOP(f); + do { + if (!BM_elem_flag_test(l_iter->e, BM_ELEM_SELECT)) { + ok = false; + break; + } + } while ((l_iter = l_iter->next) != l_first); } else { - ok = false; + ok = false; } if (ok) { - BM_elem_flag_enable(f, BM_ELEM_SELECT); + BM_elem_flag_enable(f, BM_ELEM_SELECT); } -} + } recount_totsels(bm); } -- 2.30.2