merge with/from trunk at r35190

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index 4ab04520582..524706fe42d 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -6,8 +6,9 @@
 #include "BLI_rand.h"
 #include "BLI_heap.h"
 #include "BLI_boxpack2d.h"
+#include "BLI_utildefines.h"
+
 
-#include "BKE_utildefines.h"
 
 #include "ONL_opennl.h"
 
@@ -3737,7 +3738,7 @@ static void p_smooth(PChart *chart)
 	int j, it2, maxiter2, it;
 	int nedges = chart->nedges, nwheel, gridx, gridy;
 	int edgesx, edgesy, nsize, esize, i, x, y, maxiter, totiter;
-	float minv[2], maxv[2], median, invmedian, distortion, avglen2d, avglen3d;
+	float minv[2], maxv[2], median, invmedian, avglen2d, avglen3d;
 	float center[2], dx, dy, *nodes, dlimit, d, *oldnodesx, *oldnodesy;
 	float *nodesx, *nodesy, *hedges, *vedges, climit, moved, padding;
 	SmoothTriangle *triangles, *t, *t2, **tri, **trip;
@@ -3756,7 +3757,6 @@ static void p_smooth(PChart *chart)
 	invmedian = 1.0/median;
 
 	/* compute edge distortion */
-	distortion = 0.0;
 	avglen2d = avglen3d = 0.0;
 
 	for (e=chart->edges; e; e=e->nextlink) {
@@ -4044,7 +4044,7 @@ static void p_smooth(PChart *chart)
 
 /* Exported */
 
-ParamHandle *param_construct_begin()
+ParamHandle *param_construct_begin(void)
 {
 	PHandle *handle = MEM_callocN(sizeof*handle, "PHandle");
 	handle->construction_chart = p_chart_new(handle);
@@ -4362,7 +4362,7 @@ void param_pack(ParamHandle *handle, float margin)
 	}	
 	
 	if(margin>0.0f) {
-		/* multiply the margin by the area to give pradictable results not dependant on UV scale,
+		/* multiply the margin by the area to give predictable results not dependant on UV scale,
 		 * ...Without using the area running pack multiple times also gives a bad feedback loop.
 		 * multiply by 0.1 so the margin value from the UI can be from 0.0 to 1.0 but not give a massive margin */
 		margin = (margin*(float)area) * 0.1;