[Bf-blender-cvs] [d1c6704413b] blender-v2.92-release: UV: tweak island select behavior

[Campbell Barton]

Commit: d1c6704413b5bd45283ef8ad25111597e6278105
Author: Campbell Barton
Date:   Mon Jan 25 13:26:43 2021 +1100
Branches: blender-v2.92-release
https://developer.blender.org/rBd1c6704413b5bd45283ef8ad25111597e6278105

UV: tweak island select behavior

Selecting inside an island no longer de-selects
when it's too far from an edge.

When edge select fails fall back to inside-face test.

This follows 908b383b7d2199c0c614d085ff65a03eb7852274
which made this change for face-select.

Apply to island selection since it doesn't make sense
for island select to behave differently.

===================================================================

M	source/blender/editors/uvedit/uvedit_select.c

===================================================================

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) {