Merge branch 'master' into blender2.8

1 files changed, 20 insertions, 20 deletions

diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index 32b0894e946..96335707082 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -90,7 +90,7 @@ static void screwvert_iter_init(ScrewVertIter *iter, ScrewVertConnect *array, un
 		iter->v_poin = NULL;
 		iter->e = NULL;
 	}
-}	
+}
 
 
 static void screwvert_iter_step(ScrewVertIter *iter)
@@ -185,7 +185,7 @@ static Mesh *applyModifier(
 	Mesh *result;
 	ScrewModifierData *ltmd = (ScrewModifierData *) md;
 	const bool use_render_params = (ctx->flag & MOD_APPLY_RENDER) != 0;
-	
+
 	int *origindex;
 	int mpoly_index = 0;
 	unsigned int step;
@@ -228,18 +228,18 @@ static Mesh *applyModifier(
 	float angle = ltmd->angle;
 	float screw_ofs = ltmd->screw_ofs;
 	float axis_vec[3] = {0.0f, 0.0f, 0.0f};
-	float tmp_vec1[3], tmp_vec2[3]; 
+	float tmp_vec1[3], tmp_vec2[3];
 	float mat3[3][3];
 	float mtx_tx[4][4]; /* transform the coords by an object relative to this objects transformation */
 	float mtx_tx_inv[4][4]; /* inverted */
 	float mtx_tmp_a[4][4];
-	
+
 	unsigned int vc_tot_linked = 0;
 	short other_axis_1, other_axis_2;
 	const float *tmpf1, *tmpf2;
 
 	unsigned int edge_offset;
-	
+
 	MPoly *mpoly_orig, *mpoly_new, *mp_new;
 	MLoop *mloop_orig, *mloop_new, *ml_new;
 	MEdge *medge_orig, *med_orig, *med_new, *med_new_firstloop, *medge_new;
@@ -354,7 +354,7 @@ static Mesh *applyModifier(
 		close = 1;
 		step_tot--;
 		if (step_tot < 3) step_tot = 3;
-	
+
 		maxVerts = totvert  * step_tot;   /* -1 because we're joining back up */
 		maxEdges = (totvert * step_tot) + /* these are the edges between new verts */
 		           (totedge * step_tot);  /* -1 because vert edges join */
@@ -375,9 +375,9 @@ static Mesh *applyModifier(
 	if ((ltmd->flag & MOD_SCREW_UV_STRETCH_U) == 0) {
 		uv_u_scale = (uv_u_scale / (float)ltmd->iter) * (angle / ((float)M_PI * 2.0f));
 	}
-	
+
 	result = BKE_mesh_new_nomain_from_template(mesh, (int)maxVerts, (int)maxEdges, 0, (int)maxPolys * 4, (int)maxPolys);
-	
+
 	/* copy verts from mesh */
 	mvert_orig =    mesh->mvert;
 	medge_orig =    mesh->medge;
@@ -421,10 +421,10 @@ static Mesh *applyModifier(
 	}
 
 	/* Set the locations of the first set of verts */
-	
+
 	mv_new = mvert_new;
 	mv_orig = mvert_orig;
-	
+
 	/* Copy the first set of edges */
 	med_orig = medge_orig;
 	med_new = medge_new;
@@ -434,7 +434,7 @@ static Mesh *applyModifier(
 		med_new->crease = med_orig->crease;
 		med_new->flag = med_orig->flag &  ~ME_LOOSEEDGE;
 	}
-	
+
 	/* build polygon -> edge map */
 	if (totpoly) {
 		MPoly *mp_orig;
@@ -829,7 +829,7 @@ static Mesh *applyModifier(
 		}
 	}
 	/* done with edge connectivity based normal flipping */
-	
+
 	/* Add Faces */
 	for (step = 1; step < step_tot; step++) {
 		const unsigned int varray_stride = totvert * step;
@@ -855,7 +855,7 @@ static Mesh *applyModifier(
 
 		mv_new_base = mvert_new;
 		mv_new = &mvert_new[varray_stride]; /* advance to the next slice */
-		
+
 		for (j = 0; j < totvert; j++, mv_new_base++, mv_new++) {
 			/* set normal */
 			if (vert_connect) {
@@ -864,13 +864,13 @@ static Mesh *applyModifier(
 				/* set the normal now its transformed */
 				normal_float_to_short_v3(mv_new->no, nor_tx);
 			}
-			
+
 			/* set location */
 			copy_v3_v3(mv_new->co, mv_new_base->co);
-			
+
 			/* only need to set these if using non cleared memory */
 			/*mv_new->mat_nr = mv_new->flag = 0;*/
-				
+
 			if (ltmd->ob_axis) {
 				sub_v3_v3(mv_new->co, mtx_tx[3]);
 
@@ -881,7 +881,7 @@ static Mesh *applyModifier(
 			else {
 				mul_m4_v3(mat, mv_new->co);
 			}
-			
+
 			/* add the new edge */
 			med_new->v1 = varray_stride + j;
 			med_new->v2 = med_new->v1 - totvert;
@@ -907,11 +907,11 @@ static Mesh *applyModifier(
 			med_new++;
 		}
 	}
-	
+
 	mp_new = mpoly_new;
 	ml_new = mloop_new;
 	med_new_firstloop = medge_new;
-	
+
 	/* more of an offset in this case */
 	edge_offset = totedge + (totvert * (step_tot - (close ? 0 : 1)));
 
@@ -1049,7 +1049,7 @@ static Mesh *applyModifier(
 			ml_new += 4;
 			mpoly_index++;
 		}
-		
+
 		/* new vertical edge */
 		med_new->v1 = i1;
 		med_new->v2 = i2;