[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46363] trunk/blender/source/blender/bmesh /operators/bmo_dissolve.c: minor correction for last commit, use malloc rather then calloc (array is filled in later)

[Campbell Barton]

Revision: 46363
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46363
Author:   campbellbarton
Date:     2012-05-06 18:44:18 +0000 (Sun, 06 May 2012)
Log Message:
-----------
minor correction for last commit, use malloc rather then calloc (array is filled in later)

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

Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c	2012-05-06 18:37:08 UTC (rev 46362)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c	2012-05-06 18:44:18 UTC (rev 46363)
@@ -34,14 +34,14 @@
 
 #include "intern/bmesh_operators_private.h" /* own include */
 
-#define FACE_MARK	1
-#define FACE_ORIG	2
-#define FACE_NEW	4
-#define EDGE_MARK	1
+#define FACE_MARK   1
+#define FACE_ORIG   2
+#define FACE_NEW    4
+#define EDGE_MARK   1
 
-#define VERT_MARK	1
+#define VERT_MARK   1
 
-static int UNUSED_FUNCTION(check_hole_in_region)(BMesh *bm, BMFace *f)
+static int UNUSED_FUNCTION(check_hole_in_region) (BMesh * bm, BMFace * f)
 {
 	BMWalker regwalker;
 	BMIter liter2;
@@ -60,8 +60,8 @@
 		l2 = BM_iter_new(&liter2, bm, BM_LOOPS_OF_FACE, f2);
 		for ( ; l2; l2 = BM_iter_step(&liter2)) {
 			l3 = l2->radial_next;
-			if ( BMO_elem_flag_test(bm, l3->f, FACE_MARK) !=
-			     BMO_elem_flag_test(bm, l2->f, FACE_MARK))
+			if (BMO_elem_flag_test(bm, l3->f, FACE_MARK) !=
+			    BMO_elem_flag_test(bm, l2->f, FACE_MARK))
 			{
 				if (!BMO_elem_flag_test(bm, l2->e, EDGE_MARK)) {
 					return FALSE;
@@ -433,8 +433,8 @@
 					fe = l->e;
 					for ( ; l; l = BM_iter_step(&liter)) {
 						f2 = BM_iter_new(&fiter, bm,
-								BM_FACES_OF_EDGE, l->e);
-						for ( ; f2; f2 = BM_iter_step(&fiter)) {
+						                 BM_FACES_OF_EDGE, l->e);
+						for (; f2; f2 = BM_iter_step(&fiter)) {
 							if (f2 != f) {
 								BM_faces_join_pair(bm, f, f2, l->e);
 								found2 = 1;
@@ -520,7 +520,7 @@
 	const float angle_max = (float)M_PI / 2.0f;
 	const float angle_limit = minf(angle_max, BMO_slot_float_get(op, "angle_limit"));
 	DissolveElemWeight *weight_elems = MEM_mallocN(MAX2(einput->len, vinput->len) *
-	                                                 sizeof(DissolveElemWeight), __func__);
+	                                               sizeof(DissolveElemWeight), __func__);
 	int i, tot_found;
 
 	BMIter iter;
@@ -535,7 +535,7 @@
 	/* --- first edges --- */
 
 	/* wire -> tag */
-	BM_ITER_MESH(e_iter, &iter, bm, BM_EDGES_OF_MESH) {
+	BM_ITER_MESH (e_iter, &iter, bm, BM_EDGES_OF_MESH) {
 		BM_elem_flag_set(e_iter, BM_ELEM_TAG, BM_edge_is_wire(e_iter));
 	}
 
@@ -580,7 +580,7 @@
 
 	/* prepare for cleanup */
 	BM_mesh_elem_index_ensure(bm, BM_VERT);
-	vert_reverse_lookup = MEM_callocN(sizeof(int) * bm->totvert, __func__);
+	vert_reverse_lookup = MEM_mallocN(sizeof(int) * bm->totvert, __func__);
 	fill_vn_i(vert_reverse_lookup, bm->totvert, -1);
 	for (i = 0, tot_found = 0; i < vinput->len; i++) {
 		BMVert *v = vinput_arr[i];
@@ -589,7 +589,7 @@
 
 	/* --- cleanup --- */
 	earray = MEM_mallocN(sizeof(BMEdge *) * bm->totedge, __func__);
-	BM_ITER_MESH_INDEX(e_iter, &iter, bm, BM_EDGES_OF_MESH, i) {
+	BM_ITER_MESH_INDEX (e_iter, &iter, bm, BM_EDGES_OF_MESH, i) {
 		earray[i] = e_iter;
 	}
 	/* remove all edges/verts left behind from dissolving, NULL'ing the vertex array so we dont re-use */