[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34758] trunk/blender/source/blender: error building last commit.

[Campbell Barton]

Revision: 34758
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34758
Author:   campbellbarton
Date:     2011-02-10 12:35:44 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
error building last commit.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
    trunk/blender/source/blender/blenlib/BLI_boxpack2d.h
    trunk/blender/source/blender/blenlib/intern/boxpack2d.c

Modified: trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh_validate.c	2011-02-10 12:34:52 UTC (rev 34757)
+++ trunk/blender/source/blender/blenkernel/intern/mesh_validate.c	2011-02-10 12:35:44 UTC (rev 34758)
@@ -250,12 +250,12 @@
 		/* on a valid mesh, code below will never run */
 		if(memcmp(sf->v, sf_prev->v, sizeof(sf_prev->v)) == 0) {
 			/* slow, could be smarter here */
+			EdgeUUID eu[4];
+			EdgeUUID eu_prev[4];
+
 			mf= mfaces + sf->index;
 			mf_prev= mfaces + sf_prev->index;
 
-			EdgeUUID eu[4];
-			EdgeUUID eu_prev[4];
-
 			if(mf->v4) {
 				edge_store_from_mface_quad(eu, mf);
 				edge_store_from_mface_quad(eu_prev, mf_prev);

Modified: trunk/blender/source/blender/blenlib/BLI_boxpack2d.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_boxpack2d.h	2011-02-10 12:34:52 UTC (rev 34757)
+++ trunk/blender/source/blender/blenlib/BLI_boxpack2d.h	2011-02-10 12:35:44 UTC (rev 34758)
@@ -41,5 +41,5 @@
 	struct boxVert *v[4];
 } boxPack;
 
-void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height); 
+void boxPack2D(boxPack *boxarray, const int len, float *tot_width, float *tot_height);
 

Modified: trunk/blender/source/blender/blenlib/intern/boxpack2d.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/boxpack2d.c	2011-02-10 12:34:52 UTC (rev 34757)
+++ trunk/blender/source/blender/blenlib/intern/boxpack2d.c	2011-02-10 12:35:44 UTC (rev 34758)
@@ -100,12 +100,10 @@
 /* qsort function - sort largest to smallest */
 static int box_areasort(const void *p1, const void *p2)
 {
-	const boxPack *b1=p1, *b2=p2;
-	float a1, a2;
+	const boxPack *b1= p1, *b2= p2;
+	const float a1= BOXAREA(b1);
+	const float a2= BOXAREA(b2);
 
-	a1 = BOXAREA(b1);
-	a2 = BOXAREA(b2);
-	
 	if		( a1 < a2 ) return  1;
 	else if	( a1 > a2 ) return -1;
 	return 0;
@@ -149,7 +147,7 @@
  * 	len - the number of boxes in the array.
  *	tot_width and tot_height are set so you can normalize the data.
  *  */
-void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height)
+void boxPack2D(boxPack *boxarray, const int len, float *tot_width, float *tot_height)
 {
 	boxVert *vert; /* the current vert */
 	int box_index, verts_pack_len, i, j, k, isect;