diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-01-11 16:39:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-01-11 16:53:33 +0300 |
commit | 7b6e55b933b96d5e2028be621cdbbd4e7268e800 (patch) | |
tree | 7a493295ca63c79599a88ea3c30b31dcca3822a9 /source/blender/editors/uvedit | |
parent | 2a297366f0597ec8a01dc815834db19834498d81 (diff) |
Cleanup: remove redundant UV edge selection calls
Selecting vertices and faces first checked edge selection,
this was called to set vert1 & vert2 variables which have since been
removed.
These calls should have been removed in
51f04bf7b8ee03a7973c50e525ffa5c67dde5fb7.
Diffstat (limited to 'source/blender/editors/uvedit')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_select.c | 131 |
1 files changed, 51 insertions, 80 deletions
diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c index 34e953597fb..067c4df927c 100644 --- a/source/blender/editors/uvedit/uvedit_select.c +++ b/source/blender/editors/uvedit/uvedit_select.c @@ -724,50 +724,37 @@ bool uv_find_nearest_edge_multi(Scene *scene, return found; } -bool uv_find_nearest_face(Scene *scene, Object *obedit, const float co[2], UvNearestHit *hit_final) +bool uv_find_nearest_face(Scene *scene, Object *obedit, const float co[2], UvNearestHit *hit) { - BLI_assert((hit_final->scale[0] > 0.0f) && (hit_final->scale[1] > 0.0f)); + BLI_assert((hit->scale[0] > 0.0f) && (hit->scale[1] > 0.0f)); BMEditMesh *em = BKE_editmesh_from_object(obedit); bool found = false; const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV); - /* This will fill in `hit.l`. */ - float dist_sq_init = hit_final->dist_sq; - UvNearestHit hit = *hit_final; - /* The edge of the face might be further away than the threshold from it's center. */ - hit.dist_sq = FLT_MAX; - if (uv_find_nearest_edge(scene, obedit, co, &hit)) { - hit.dist_sq = dist_sq_init; - hit.l = NULL; + BMIter iter; + BMFace *efa; - BMIter iter; - BMFace *efa; + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { + if (!uvedit_face_visible_test(scene, efa)) { + continue; + } - BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { - if (!uvedit_face_visible_test(scene, efa)) { - continue; - } + float cent[2]; + BM_face_uv_calc_center_median(efa, cd_loop_uv_offset, cent); - float cent[2]; - BM_face_uv_calc_center_median(efa, cd_loop_uv_offset, cent); + float delta[2]; + sub_v2_v2v2(delta, co, cent); + mul_v2_v2(delta, hit->scale); - float delta[2]; - sub_v2_v2v2(delta, co, cent); - mul_v2_v2(delta, hit.scale); + const float dist_test_sq = len_squared_v2(delta); - const float dist_test_sq = len_squared_v2(delta); - - if (dist_test_sq < hit.dist_sq) { - hit.efa = efa; - hit.dist_sq = dist_test_sq; - found = true; - } + if (dist_test_sq < hit->dist_sq) { + hit->efa = efa; + hit->dist_sq = dist_test_sq; + found = true; } } - if (found) { - *hit_final = hit; - } return found; } @@ -798,74 +785,58 @@ static bool uv_nearest_between(const BMLoop *l, const float co[2], const int cd_ (line_point_side_v2(uv_next, uv_curr, co) <= 0.0f)); } -bool uv_find_nearest_vert(Scene *scene, - Object *obedit, - float const co[2], - const float penalty_dist, - UvNearestHit *hit_final) +bool uv_find_nearest_vert( + Scene *scene, Object *obedit, float const co[2], const float penalty_dist, UvNearestHit *hit) { - BLI_assert((hit_final->scale[0] > 0.0f) && (hit_final->scale[1] > 0.0f)); + BLI_assert((hit->scale[0] > 0.0f) && (hit->scale[1] > 0.0f)); bool found = false; - /* This will fill in `hit.l`. */ - float dist_sq_init = hit_final->dist_sq; - UvNearestHit hit = *hit_final; - if (uv_find_nearest_edge(scene, obedit, co, &hit)) { - hit.dist_sq = dist_sq_init; - - hit.l = NULL; - - BMEditMesh *em = BKE_editmesh_from_object(obedit); - BMFace *efa; - BMIter iter; + BMEditMesh *em = BKE_editmesh_from_object(obedit); + BMFace *efa; + BMIter iter; - BM_mesh_elem_index_ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); - const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV); + const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV); - BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { - if (!uvedit_face_visible_test(scene, efa)) { - continue; - } + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { + if (!uvedit_face_visible_test(scene, efa)) { + continue; + } - BMIter liter; - BMLoop *l; - int i; - BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { - MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset); + BMIter liter; + BMLoop *l; + int i; + BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { + MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset); - float delta[2]; + float delta[2]; - sub_v2_v2v2(delta, co, luv->uv); - mul_v2_v2(delta, hit.scale); + sub_v2_v2v2(delta, co, luv->uv); + mul_v2_v2(delta, hit->scale); - float dist_test_sq = len_squared_v2(delta); + float dist_test_sq = len_squared_v2(delta); - if ((penalty_dist != 0.0f) && uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) { - dist_test_sq = square_f(sqrtf(dist_test_sq) + penalty_dist); - } + if ((penalty_dist != 0.0f) && uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) { + dist_test_sq = square_f(sqrtf(dist_test_sq) + penalty_dist); + } - if (dist_test_sq <= hit.dist_sq) { - if (dist_test_sq == hit.dist_sq) { - if (!uv_nearest_between(l, co, cd_loop_uv_offset)) { - continue; - } + if (dist_test_sq <= hit->dist_sq) { + if (dist_test_sq == hit->dist_sq) { + if (!uv_nearest_between(l, co, cd_loop_uv_offset)) { + continue; } + } - hit.dist_sq = dist_test_sq; + hit->dist_sq = dist_test_sq; - hit.l = l; - hit.efa = efa; - found = true; - } + hit->l = l; + hit->efa = efa; + found = true; } } } - if (found) { - *hit_final = hit; - } - return found; } |