blender
/
blender
134
402
Fork 584
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Merge branch 'blender-v3.2-release'

This commit is contained in:
Campbell Barton 2022-06-03 13:15:35 +10:00
parent 1fb36e9a7c c4701a027f
commit 9ad19b0453
Notes: blender-bot 2023-02-14 06:21:59 +01:00 
Referenced by issue #98558, Regression: Crash when using island selection in UV editor
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/uvedit/uvedit_select.c
View File

@ -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);
}
}
}