Update create_vert_edge_map() to match create_vert_poly_map().

2 files changed, 32 insertions, 14 deletions

diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 62ba85ae937..c168c39fd9f 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -266,8 +266,8 @@ void create_vert_poly_map(MeshElemMap **map, int **mem,
                           const struct MPoly *mface, const struct MLoop *mloop,
                           int totvert, int totface, int totloop);
 	
-void create_vert_edge_map(struct ListBase **map, IndexNode **mem, const struct MEdge *medge,
-                          const int totvert, const int totedge);
+void create_vert_edge_map(MeshElemMap **map, int **mem,
+						  const struct MEdge *medge, int totvert, int totedge);
 
 /* vertex level transformations & checks (no derived mesh) */
 
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index d478302931f..e3876f438f7 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -2287,21 +2287,39 @@ void create_vert_poly_map(MeshElemMap **map, int **mem,
 /* Generates a map where the key is the vertex and the value is a list
  * of edges that use that vertex as an endpoint. The lists are allocated
  * from one memory pool. */
-void create_vert_edge_map(ListBase **map, IndexNode **mem, const MEdge *medge, const int totvert, const int totedge)
+void create_vert_edge_map(MeshElemMap **map, int **mem,
+						  const MEdge *medge, int totvert, int totedge)
 {
-	int i, j;
-	IndexNode *node = NULL;
- 
-	(*map) = MEM_callocN(sizeof(ListBase) * totvert, "vert edge map");
-	(*mem) = MEM_callocN(sizeof(IndexNode) * totedge * 2, "vert edge map mem");
-	node = *mem;
+	int i, *indices;
+
+	(*map) = MEM_callocN(sizeof(MeshElemMap) * totvert, "vert-edge map");
+	(*mem) = MEM_mallocN(sizeof(int) * totedge * 2, "vert-edge map mem");
+
+	/* Count number of edges for each vertex */
+	for (i = 0; i < totedge; i++) {
+		(*map)[medge[i].v1].count++;
+		(*map)[medge[i].v2].count++;
+	}
 
+	/* Assign indices mem */
+	indices = (*mem);
+	for (i = 0; i < totvert; i++) {
+		(*map)[i].indices = indices;
+		indices += (*map)[i].count;
+
+		/* Reset 'count' for use as index in last loop */
+		(*map)[i].count = 0;
+	}
+		
 	/* Find the users */
-	for (i = 0; i < totedge; ++i) {
-		for (j = 0; j < 2; ++j, ++node) {
-			node->index = i;
-			BLI_addtail(&(*map)[((unsigned int *)(&medge[i].v1))[j]], node);
-		}
+	for (i = 0; i < totedge; i++) {
+		const int v[2] = {medge[i].v1, medge[i].v2};
+
+		(*map)[v[0]].indices[(*map)[v[0]].count] = i;
+		(*map)[v[1]].indices[(*map)[v[1]].count] = i;
+		
+		(*map)[v[0]].count++;
+		(*map)[v[1]].count++;
 	}
 }