diff options
author | Campbell Barton <campbell@blender.org> | 2022-06-03 06:15:35 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-06-03 06:15:35 +0300 |
commit | 9ad19b0453f0e1d2f4653de608a71d3062092060 (patch) | |
tree | bba0bf698c05c195bede5c05c3bff15deaa78ead | |
parent | 1fb36e9a7c67d28b1b6d1cefa255ef59a170855b (diff) | |
parent | c4701a027fed83d2aea4f0f26a845e4d6852b1ff (diff) |
Merge branch 'blender-v3.2-release'
-rw-r--r-- | source/blender/editors/uvedit/uvedit_select.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c index ead017a91bf..43f88c41ef0 100644 --- a/source/blender/editors/uvedit/uvedit_select.c +++ b/source/blender/editors/uvedit/uvedit_select.c @@ -2514,8 +2514,15 @@ static bool uv_mouse_select_multi(bContext *C, else if (selectmode == UV_SELECT_EDGE) { is_selected = uvedit_edge_select_test(scene, hit.l, cd_loop_uv_offset); } - else { /* Vertex or island. */ - is_selected = uvedit_uv_select_test(scene, hit.l, cd_loop_uv_offset); + else { + /* Vertex or island. For island (if we were using #uv_find_nearest_face_multi_ex, see above), + * `hit.l` is NULL, use `hit.efa` instead. */ + if (hit.l != NULL) { + is_selected = uvedit_uv_select_test(scene, hit.l, cd_loop_uv_offset); + } + else { + is_selected = uvedit_face_select_test(scene, hit.efa, cd_loop_uv_offset); + } } } |