[Bf-blender-cvs] [b31d3d1202f] master: Fix UV edge/face sync selection from recent sticky select cleanup

Campbell Barton noreply at git.blender.org
Tue Jul 21 07:47:25 CEST 2020


Commit: b31d3d1202fed37caed333b829bb53d88fe97c9e
Author: Campbell Barton
Date:   Tue Jul 21 15:46:14 2020 +1000
Branches: master
https://developer.blender.org/rBb31d3d1202fed37caed333b829bb53d88fe97c9e

Fix UV edge/face sync selection from recent sticky select cleanup

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

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 2a6c5a67b1d..92e110b0998 100644
--- a/source/blender/editors/uvedit/uvedit_select.c
+++ b/source/blender/editors/uvedit/uvedit_select.c
@@ -220,6 +220,12 @@ void uvedit_face_select_set_with_sticky(const SpaceImage *sima,
                                         const bool do_history,
                                         const int cd_loop_uv_offset)
 {
+  const ToolSettings *ts = scene->toolsettings;
+  if (ts->uv_flag & UV_SYNC_SELECTION) {
+    uvedit_face_select_set(scene, em, efa, select, do_history, cd_loop_uv_offset);
+    return;
+  }
+
   BMLoop *l_iter, *l_first;
   l_iter = l_first = BM_FACE_FIRST_LOOP(efa);
   do {
@@ -324,6 +330,12 @@ void uvedit_edge_select_set_with_sticky(const struct SpaceImage *sima,
                                         const bool do_history,
                                         const uint cd_loop_uv_offset)
 {
+  const ToolSettings *ts = scene->toolsettings;
+  if (ts->uv_flag & UV_SYNC_SELECTION) {
+    uvedit_edge_select_set(scene, em, l, select, do_history, cd_loop_uv_offset);
+    return;
+  }
+
   uvedit_uv_select_set_with_sticky(sima, scene, em, l, select, do_history, cd_loop_uv_offset);
   uvedit_uv_select_set_with_sticky(
       sima, scene, em, l->next, select, do_history, cd_loop_uv_offset);



More information about the Bf-blender-cvs mailing list