diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-01-23 00:01:33 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-01-23 00:01:33 +0400 |
| commit | 359e961a12e5c2f6432b8d65a543d2d6e389ba17 (patch) | |
| tree | 718af32df5cf83ab7e141a4d1ac139838c24bea4 | |
| parent | 008b0e90dd87490763f685d822ffe37d40ede7c7 (diff) | |
restrict stitching of same island uvs to only midpoint, without snapping case
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 3731d348522..e99a90f34c5 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -290,7 +290,8 @@ static int stitch_check_uvs_stitchable(UvElement *element, UvElement *element_it static int stitch_check_uvs_state_stitchable(UvElement *element, UvElement *element_iter, StitchState *state){ - if(state->snap_islands && element->island == element_iter->island) + if((state->snap_islands && element->island == element_iter->island) || + (!state->midpoints && element->island == element_iter->island)) return 0; return stitch_check_uvs_stitchable(element, element_iter, state); @@ -543,9 +544,8 @@ static void stitch_validate_stichability(UvElement *element, StitchState *state, if(element_iter->separate){ if(element_iter == element) continue; - if(stitch_check_uvs_stitchable(element, element_iter, state)){ - if(((element_iter->island == state->static_island) || (element->island == state->static_island)) && - !((element_iter->island == element->island) && state->snap_islands)){ + if(stitch_check_uvs_state_stitchable(element, element_iter, state)){ + if((element_iter->island == state->static_island) || (element->island == state->static_island)){ element->flag |= STITCH_STITCHABLE; preview->num_stitchable++; stitch_setup_face_preview_for_uv_group(element, state, island_stitch_data); |