Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-01-25 05:37:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-25 05:37:54 +0300
commit850115531d41245c09bc56cca4440d81b519ad21 (patch)
treeab2666520e3d3fe80a0931307e934dd7b43a54cf /source/blender
parentcf6d17a6aa421e0038fc1f8e60e3f1f708887c3e (diff)
parentd1c6704413b5bd45283ef8ad25111597e6278105 (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/uvedit/uvedit_select.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c
index 32e77ef7347..0bc1943802a 100644
--- a/source/blender/editors/uvedit/uvedit_select.c
+++ b/source/blender/editors/uvedit/uvedit_select.c
@@ -1982,6 +1982,13 @@ static int uv_mouse_select_multi(bContext *C,
}
else if (selectmode == UV_SELECT_ISLAND) {
found_item = uv_find_nearest_edge_multi(scene, objects, objects_len, co, &hit);
+
+ if (!found_item) {
+ /* Without this, we can be within the face of an island but too far from an edge,
+ * see face selection comment for details. */
+ hit.dist_sq = FLT_MAX;
+ found_item = uv_find_nearest_face_multi_ex(scene, objects, objects_len, co, &hit, true);
+ }
}
if (!found_item) {