[Bf-blender-cvs] [062764d5d01] blender-v2.93-release: Fix T89861: Checking face selection breaks UV stitch operator
Campbell Barton
noreply at git.blender.org
Mon Jul 26 08:52:29 CEST 2021
Commit: 062764d5d0197ff88a0e49a758d6e6ccb0e0e13c
Author: Campbell Barton
Date: Fri Jul 16 17:47:42 2021 +1000
Branches: blender-v2.93-release
https://developer.blender.org/rB062764d5d0197ff88a0e49a758d6e6ccb0e0e13c
Fix T89861: Checking face selection breaks UV stitch operator
===================================================================
M source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c
index 8ebf000baaa..0f9836896c5 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.c
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c
@@ -1928,6 +1928,11 @@ static StitchState *stitch_init(bContext *C,
state->obedit = obedit;
state->em = em;
+ /* Workaround for sync-select & face-select mode which implies all selected faces are detached,
+ * for stitch this isn't useful behavior, see T86924. */
+ const int selectmode_orig = scene->toolsettings->selectmode;
+ scene->toolsettings->selectmode = SCE_SELECT_VERTEX;
+
/* in uv synch selection, all uv's are visible */
if (ts->uv_flag & UV_SYNC_SELECTION) {
state->element_map = BM_uv_element_map_create(state->em->bm, scene, false, false, true, true);
@@ -1935,6 +1940,9 @@ static StitchState *stitch_init(bContext *C,
else {
state->element_map = BM_uv_element_map_create(state->em->bm, scene, true, false, true, true);
}
+
+ scene->toolsettings->selectmode = selectmode_orig;
+
if (!state->element_map) {
state_delete(state);
return NULL;
More information about the Bf-blender-cvs
mailing list