[Bf-blender-cvs] [9e5635b] soc-2016-uv_tools: Compilefix for conflicting types

[Jens Verwiebe]

Commit: 9e5635b8a20564614019e2b021687581ba16a08e
Author: Jens Verwiebe
Date:   Mon Jul 18 19:46:59 2016 +0200
Branches: soc-2016-uv_tools
https://developer.blender.org/rB9e5635b8a20564614019e2b021687581ba16a08e

Compilefix for conflicting types

===================================================================

M	source/blender/editors/uvedit/uvedit_parametrizer.h

===================================================================

diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h
index 3698c52..710d4fd 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.h
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.h
@@ -1,3 +1,4 @@
+
 /*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -105,7 +106,7 @@ void param_pack(ParamHandle *handle, float margin, bool do_rotate);
 /* Packing 2.0 */
 
 void param_irregular_pack_begin(ParamHandle *handle);
-void param_irregular_pack_iter(ParamHandle *handle, float *w_area, int seed);
+void param_irregular_pack_iter(ParamHandle *handle, float *w_area, unsigned int seed);
 void param_irregular_pack_end(ParamHandle *handle);
 
 /* Average area for all charts */