[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43615] trunk/blender/source/blender/ editors/uvedit/uvedit_smart_stitch.c: restrict stitching of same island uvs to only midpoint, without snapping case

[Antony Riakiotakis]

Revision: 43615
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43615
Author:   psy-fi
Date:     2012-01-22 20:01:33 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
restrict stitching of same island uvs to only midpoint, without snapping case

Modified Paths:
--------------
    trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c	2012-01-22 19:52:41 UTC (rev 43614)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c	2012-01-22 20:01:33 UTC (rev 43615)
@@ -290,7 +290,8 @@
 
 
 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 @@
 		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);