[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44530] trunk/blender/source/blender/bmesh /operators/bmo_create.c: fix for leak in bmo_edgenet_fill_exec and remove invalid comment.

[Campbell Barton]

Revision: 44530
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44530
Author:   campbellbarton
Date:     2012-02-28 20:06:52 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
fix for leak in bmo_edgenet_fill_exec and remove invalid comment.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_create.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c	2012-02-28 19:43:33 UTC (rev 44529)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c	2012-02-28 20:06:52 UTC (rev 44530)
@@ -83,7 +83,7 @@
 	)
 
 
-static int rotsys_append_edge(struct BMEdge *e, struct BMVert *v,
+static int rotsys_append_edge(BMEdge *e, BMVert *v,
                               EdgeData *edata, VertData *vdata)
 {
 	EdgeData *ed = &edata[BM_elem_index_get(e)];
@@ -115,7 +115,7 @@
 	return TRUE;
 }
 
-static void UNUSED_FUNCTION(rotsys_remove_edge)(struct BMEdge *e, struct BMVert *v,
+static void UNUSED_FUNCTION(rotsys_remove_edge)(BMEdge *e, BMVert *v,
                                                 EdgeData *edata, VertData *vdata)
 {
 	EdgeData *ed = edata + BM_elem_index_get(e);
@@ -139,8 +139,8 @@
 	e1->next = e1->prev = NULL;
 }
 
-static struct BMEdge *rotsys_nextedge(struct BMEdge *e, struct BMVert *v,
-                                      EdgeData *edata, VertData *UNUSED(vdata))
+static BMEdge *rotsys_nextedge(BMEdge *e, BMVert *v,
+                               EdgeData *edata, VertData *UNUSED(vdata))
 {
 	if (v == e->v1)
 		return edata[BM_elem_index_get(e)].v1_disk_link.next;
@@ -159,7 +159,7 @@
 	return NULL;
 }
 
-static void rotsys_reverse(struct BMEdge *UNUSED(e), struct BMVert *v, EdgeData *edata, VertData *vdata)
+static void rotsys_reverse(BMEdge *UNUSED(e), BMVert *v, EdgeData *edata, VertData *vdata)
 {
 	BMEdge **edges = NULL;
 	BMEdge *e_first;
@@ -186,7 +186,7 @@
 	BLI_array_free(edges);
 }
 
-static int UNUSED_FUNCTION(rotsys_count)(struct BMVert *v, EdgeData *edata, VertData *vdata)
+static int UNUSED_FUNCTION(rotsys_count)(BMVert *v, EdgeData *edata, VertData *vdata)
 {
 	BMEdge *e = vdata[BM_elem_index_get(v)].e;
 	int i = 0;
@@ -870,7 +870,7 @@
 	EdgeData *edata;
 	VertData *vdata;
 	BMEdge **edges = NULL;
-	PathBase *pathbase = edge_pathbase_new();
+	PathBase *pathbase;
 	BLI_array_declare(edges);
 	int use_restrict   = BMO_slot_bool_get(op, "use_restrict");
 	int use_fill_check = BMO_slot_bool_get(op, "use_fill_check");
@@ -880,6 +880,8 @@
 	if (!bm->totvert || !bm->totedge)
 		return;
 
+	pathbase = edge_pathbase_new();
+
 	edata = MEM_callocN(sizeof(EdgeData) * bm->totedge, "EdgeData");
 	vdata = MEM_callocN(sizeof(VertData) * bm->totvert, "VertData");
 	
@@ -1332,10 +1334,6 @@
 	}
 	/* --- end special case support, continue as normal --- */
 
-
-	/* possible bug?, selecting 2 triangles and pressing F will make a quad rather then joining them,
-	 * perhaps this should be looked into? - campbell */
-
 	/* call edgenet create */
 	/* call edgenet prepare op so additional face creation cases wor */
 	BMO_op_initf(bm, &op2, "edgenet_prepare edges=%fe", ELE_NEW);