part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)

1 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h
index 8d440e2e652..912270da9ca 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.h
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.h
@@ -22,7 +22,7 @@ typedef enum ParamBool {
    - vertices are implicitly created
    - in construct_end the mesh will be split up according to the seams
    - the resulting charts must be:
-      - manifold, connected, open (at least one boundary loop)
+	  - manifold, connected, open (at least one boundary loop)
    - output will be written to the uv pointers
 */
 
@@ -33,16 +33,16 @@ void param_aspect_ratio(ParamHandle *handle, float aspx, float aspy);
 int p_face_exists(ParamHandle *handle, ParamKey *vkeys, int i1, int i2, int i3);
 
 void param_face_add(ParamHandle *handle,
-                    ParamKey key,
-                    int nverts,	
-                    ParamKey *vkeys,
-                    float **co,
-                    float **uv,
+					ParamKey key,
+					int nverts,	
+					ParamKey *vkeys,
+					float **co,
+					float **uv,
 					ParamBool *pin,
 					ParamBool *select);
 
 void param_edge_set_seam(ParamHandle *handle,
-                         ParamKey *vkeys);
+						 ParamKey *vkeys);
 
 void param_construct_end(ParamHandle *handle, ParamBool fill, ParamBool impl);
 void param_delete(ParamHandle *chart);
@@ -51,8 +51,8 @@ void param_delete(ParamHandle *chart);
    -----------------------------
    - charts with less than two pinned vertices are assigned 2 pins
    - lscm is divided in three steps:
-      - begin: compute matrix and it's factorization (expensive)
-      - solve using pinned coordinates (cheap)
+	  - begin: compute matrix and it's factorization (expensive)
+	  - solve using pinned coordinates (cheap)
 	  - end: clean up 
 	- uv coordinates are allowed to change within begin/end, for
 	  quick re-solving