[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21840] branches/bmesh/blender/source/ blender/editors: edge and loop select work in uv editor again.

[Joseph Eagar]

Revision: 21840
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21840
Author:   joeedh
Date:     2009-07-24 09:39:41 +0200 (Fri, 24 Jul 2009)

Log Message:
-----------
edge and loop select work in uv editor again.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c	2009-07-24 06:51:33 UTC (rev 21839)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c	2009-07-24 07:39:41 UTC (rev 21840)
@@ -586,7 +586,7 @@
 				buf->f= a;
 				buf->separate = 0;
 				
-				buf->next= vmap->vert[BMINDEX_GET(((BMLoop*)l->head.next)->v)];
+				buf->next= vmap->vert[BMINDEX_GET(l->v)];
 				vmap->vert[BMINDEX_GET(l->v)]= buf;
 				
 				buf++;

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c	2009-07-24 06:51:33 UTC (rev 21839)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c	2009-07-24 07:39:41 UTC (rev 21840)
@@ -604,6 +604,8 @@
 				hit->lindex = i;
 				hit->vert1 = BMINDEX_GET(hit->l->v);
 				hit->vert2 = BMINDEX_GET(((BMLoop*)hit->l->head.next)->v);
+
+				mindist = dist;
 			}
 
 			i++;

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.c	2009-07-24 06:51:33 UTC (rev 21839)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.c	2009-07-24 07:39:41 UTC (rev 21840)
@@ -727,7 +727,7 @@
 	return NULL;
 }
 
-static PBool p_face_exists(PHandle *handle, PHashKey *vkeys, int i1, int i2, int i3)
+int p_face_exists(PHandle *handle, PHashKey *vkeys, int i1, int i2, int i3)
 {
 	PHashKey key = PHASH_edge(vkeys[i1], vkeys[i2]);
 	PEdge *e = (PEdge*)phash_lookup(handle->hash_edges, key);

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.h	2009-07-24 06:51:33 UTC (rev 21839)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.h	2009-07-24 07:39:41 UTC (rev 21840)
@@ -30,6 +30,8 @@
 
 void param_aspect_ratio(ParamHandle *handle, float aspx, float aspy);
 
+int p_face_exists(ParamKey *handle, ParamKey *vkeys, int i1, int i2, int i3);
+
 void param_face_add(ParamHandle *handle,
                     ParamKey key,
                     int nverts,	

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2009-07-24 06:51:33 UTC (rev 21839)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2009-07-24 07:39:41 UTC (rev 21840)
@@ -216,7 +216,8 @@
 			select[1] = uvedit_uv_selected(em, scene, ls[1]) != 0;
 			select[2] = uvedit_uv_selected(em, scene, ls[2]) != 0;
 
-			param_face_add(handle, key, 3, vkeys, co, uv, pin, select);
+			if (!p_face_exists(handle,vkeys,0,1,2))
+					param_face_add(handle, key, 3, vkeys, co, uv, pin, select);
 		}
 
 		BLI_end_edgefill();