blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T89861: Checking face selection breaks UV stitch operator

This commit is contained in:
Campbell Barton 2021-07-16 17:47:42 +10:00
parent 38131cc5e5
commit 038345fa56
Notes: blender-bot 2023-02-13 18:10:23 +01:00 
Referenced by issue #88449, Blender LTS: Maintenance Task 2.93
Referenced by issue #89861, Stitch on polygon mode in the UV editor is broken in Blender 2.93 but works in Blender 2.92
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/uvedit/uvedit_smart_stitch.c
View File

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