Merge branch 'master' into blender2.8

1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c
index df607c04164..edf59f6b6b2 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -99,7 +99,7 @@ static void *dualcon_alloc_output(int totvert, int totquad)
 	{
 		return NULL;
 	}
-	
+
 	output->mesh = BKE_mesh_new_nomain(totvert, 0, 0, 4 * totquad, totquad);
 	return output;
 }
@@ -108,9 +108,9 @@ static void dualcon_add_vert(void *output_v, const float co[3])
 {
 	DualConOutput *output = output_v;
 	Mesh *mesh = output->mesh;
-	
+
 	assert(output->curvert < mesh->totvert);
-	
+
 	copy_v3_v3(mesh->mvert[output->curvert].co, co);
 	output->curvert++;
 }
@@ -122,17 +122,17 @@ static void dualcon_add_quad(void *output_v, const int vert_indices[4])
 	MLoop *mloop;
 	MPoly *cur_poly;
 	int i;
-	
+
 	assert(output->curface < mesh->totpoly);
 
 	mloop = mesh->mloop;
 	cur_poly = &mesh->mpoly[output->curface];
-	
+
 	cur_poly->loopstart = output->curface * 4;
 	cur_poly->totloop = 4;
 	for (i = 0; i < 4; i++)
 		mloop[output->curface * 4 + i].v = vert_indices[i];
-	
+
 	output->curface++;
 }
 
@@ -166,7 +166,7 @@ static Mesh *applyModifier(
 			mode = DUALCON_SHARP_FEATURES;
 			break;
 	}
-	
+
 	output = dualcon(&input,
 	                 dualcon_alloc_output,
 	                 dualcon_add_vert,
@@ -183,7 +183,7 @@ static Mesh *applyModifier(
 	if (rmd->flag & MOD_REMESH_SMOOTH_SHADING) {
 		MPoly *mpoly = result->mpoly;
 		int i, totpoly = result->totpoly;
-		
+
 		/* Apply smooth shading to output faces */
 		for (i = 0; i < totpoly; i++) {
 			mpoly[i].flag |= ME_SMOOTH;