[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22389] branches/bmesh/blender/source/ blender/bmesh/intern/bmesh_walkers.c: some uv/vcol collapse fixes.

[Joseph Eagar]

Revision: 22389
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22389
Author:   joeedh
Date:     2009-08-12 06:23:47 +0200 (Wed, 12 Aug 2009)

Log Message:
-----------
some uv/vcol collapse fixes.  need to still work out the rules of collapsing regions of geometry that include seams, not sure how best to handle that.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c	2009-08-12 03:51:28 UTC (rev 22388)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c	2009-08-12 04:23:47 UTC (rev 22389)
@@ -850,15 +850,6 @@
 	if (!lwalk) return NULL;
 }
 
-static int walker_compare_uv(MLoopUV *luv1, MLoopUV *luv2)
-{
-	float udelta = luv1->uv[0] - luv2->uv[0];
-	float vdelta = luv1->uv[1] - luv2->uv[1];
-
-	/*BMESH_TODO: look up proper threshold value*/
-	return udelta*udelta + vdelta*vdelta < 0.0001f;
-}
-
 static void *uvedgeWalker_step(BMWalker *walker)
 {
 	uvedgeWalker *lwalk = walker->currentstate;
@@ -879,9 +870,8 @@
 	/*go over loops around l->v and nl->v and see which ones share l and nl's 
 	  mloopuv's coordinates. in addition, push on l->head.next if necassary.*/
 	for (i=0; i<2; i++) {
-		BM_ITER(l2, &liter, walker->bm, BM_LOOPS_OF_VERT, i?nl->v:l->v) {
-			cl = i ? nl : l;
-
+		cl = i ? nl : l;
+		BM_ITER(l2, &liter, walker->bm, BM_LOOPS_OF_VERT, cl->v) {
 			d1 = CustomData_bmesh_get_layer_n(&walker->bm->ldata, 
 			             cl->head.data, walker->flag);
 			
@@ -891,7 +881,7 @@
 					continue;
 				if (walker->restrictflag && !(BMO_TestFlag(walker->bm, l2->e, walker->restrictflag)))
 				{
-					if (l2->v != l->v)
+					if (l2->v != cl->v)
 						continue;
 				}