Cleanup: strip trailing space for cycles

41 files changed, 55 insertions, 96 deletions

diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index 2bee4bc7b69..ab69afa051e 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -498,4 +498,3 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ccl_a
 CCL_NAMESPACE_END
 
 #endif /* __SVM_H__ */
-
diff --git a/intern/cycles/kernel/svm/svm_attribute.h b/intern/cycles/kernel/svm/svm_attribute.h
index 229a3f20421..d98f538d089 100644
--- a/intern/cycles/kernel/svm/svm_attribute.h
+++ b/intern/cycles/kernel/svm/svm_attribute.h
@@ -154,4 +154,3 @@ void svm_node_attr_bump_dy(KernelGlobals *kg,
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_bevel.h b/intern/cycles/kernel/svm/svm_bevel.h
index 89f4a98e846..19cdb71c20f 100644
--- a/intern/cycles/kernel/svm/svm_bevel.h
+++ b/intern/cycles/kernel/svm/svm_bevel.h
@@ -223,4 +223,3 @@ ccl_device void svm_node_bevel(
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_brick.h b/intern/cycles/kernel/svm/svm_brick.h
index 90fa2a99b67..744d9ff16c5 100644
--- a/intern/cycles/kernel/svm/svm_brick.h
+++ b/intern/cycles/kernel/svm/svm_brick.h
@@ -36,7 +36,7 @@ ccl_device_noinline float2 svm_brick(float3 p, float mortar_size, float mortar_s
 	float x, y;
 
 	rownum = floor_to_int(p.y / row_height);
-	
+
 	if(offset_frequency && squash_frequency) {
 		brick_width *= (rownum % squash_frequency) ? 1.0f : squash_amount; /* squash */
 		offset = (rownum % offset_frequency) ? 0.0f : (brick_width*offset_amount); /* offset */
@@ -66,31 +66,31 @@ ccl_device_noinline float2 svm_brick(float3 p, float mortar_size, float mortar_s
 }
 
 ccl_device void svm_node_tex_brick(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
-{	
+{
 	uint4 node2 = read_node(kg, offset);
 	uint4 node3 = read_node(kg, offset);
 	uint4 node4 = read_node(kg, offset);
-	
+
 	/* Input and Output Sockets */
 	uint co_offset, color1_offset, color2_offset, mortar_offset, scale_offset;
 	uint mortar_size_offset, bias_offset, brick_width_offset, row_height_offset;
 	uint color_offset, fac_offset, mortar_smooth_offset;
-	
+
 	/* RNA properties */
 	uint offset_frequency, squash_frequency;
-	
+
 	decode_node_uchar4(node.y, &co_offset, &color1_offset, &color2_offset, &mortar_offset);
 	decode_node_uchar4(node.z, &scale_offset, &mortar_size_offset, &bias_offset, &brick_width_offset);
 	decode_node_uchar4(node.w, &row_height_offset, &color_offset, &fac_offset, &mortar_smooth_offset);
-	
+
 	decode_node_uchar4(node2.x, &offset_frequency, &squash_frequency, NULL, NULL);
 
 	float3 co = stack_load_float3(stack, co_offset);
-	
+
 	float3 color1 = stack_load_float3(stack, color1_offset);
 	float3 color2 = stack_load_float3(stack, color2_offset);
 	float3 mortar = stack_load_float3(stack, mortar_offset);
-	
+
 	float scale = stack_load_float_default(stack, scale_offset, node2.y);
 	float mortar_size = stack_load_float_default(stack, mortar_size_offset, node2.z);
 	float mortar_smooth = stack_load_float_default(stack, mortar_smooth_offset, node4.x);
@@ -99,13 +99,13 @@ ccl_device void svm_node_tex_brick(KernelGlobals *kg, ShaderData *sd, float *sta
 	float row_height = stack_load_float_default(stack, row_height_offset, node3.y);
 	float offset_amount = __int_as_float(node3.z);
 	float squash_amount = __int_as_float(node3.w);
-	
+
 	float2 f2 = svm_brick(co*scale, mortar_size, mortar_smooth, bias, brick_width, row_height,
 		offset_amount, offset_frequency, squash_amount, squash_frequency);
 
 	float tint = f2.x;
 	float f = f2.y;
-	
+
 	if(f != 1.0f) {
 		float facm = 1.0f - tint;
 		color1 = facm * color1 + tint * color2;
@@ -118,4 +118,3 @@ ccl_device void svm_node_tex_brick(KernelGlobals *kg, ShaderData *sd, float *sta
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_bump.h b/intern/cycles/kernel/svm/svm_bump.h
index 610d9af9e1f..1c1fe155538 100644
--- a/intern/cycles/kernel/svm/svm_bump.h
+++ b/intern/cycles/kernel/svm/svm_bump.h
@@ -51,4 +51,3 @@ ccl_device void svm_node_leave_bump_eval(KernelGlobals *kg, ShaderData *sd, floa
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_camera.h b/intern/cycles/kernel/svm/svm_camera.h
index 90249dfd978..cf90229b53b 100644
--- a/intern/cycles/kernel/svm/svm_camera.h
+++ b/intern/cycles/kernel/svm/svm_camera.h
@@ -38,4 +38,3 @@ ccl_device void svm_node_camera(KernelGlobals *kg, ShaderData *sd, float *stack,
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_checker.h b/intern/cycles/kernel/svm/svm_checker.h
index cea245991de..45e6c181e9e 100644
--- a/intern/cycles/kernel/svm/svm_checker.h
+++ b/intern/cycles/kernel/svm/svm_checker.h
@@ -33,7 +33,7 @@ ccl_device_noinline float svm_checker(float3 p)
 }
 
 ccl_device void svm_node_tex_checker(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node)
-{	
+{
 	uint co_offset, color1_offset, color2_offset, scale_offset;
 	uint color_offset, fac_offset;
 
@@ -44,7 +44,7 @@ ccl_device void svm_node_tex_checker(KernelGlobals *kg, ShaderData *sd, float *s
 	float3 color1 = stack_load_float3(stack, color1_offset);
 	float3 color2 = stack_load_float3(stack, color2_offset);
 	float scale = stack_load_float_default(stack, scale_offset, node.w);
-	
+
 	float f = svm_checker(co*scale);
 
 	if(stack_valid(color_offset))
@@ -54,4 +54,3 @@ ccl_device void svm_node_tex_checker(KernelGlobals *kg, ShaderData *sd, float *s
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index f5b316c67da..4de9cfb88db 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -130,7 +130,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 
 			// calculate weights of the diffuse and specular part
 			float diffuse_weight = (1.0f - saturate(metallic)) * (1.0f - saturate(transmission));
-			
+
 			float final_transmission = saturate(transmission) * (1.0f - saturate(metallic));
 			float specular_weight = (1.0f - final_transmission);
 
@@ -713,7 +713,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 				bsdf->N = N;
 				bsdf->size = param1;
 				bsdf->smooth = param2;
-				
+
 				if(type == CLOSURE_BSDF_DIFFUSE_TOON_ID)
 					sd->flag |= bsdf_diffuse_toon_setup(bsdf);
 				else
@@ -725,7 +725,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 		case CLOSURE_BSDF_HAIR_REFLECTION_ID:
 		case CLOSURE_BSDF_HAIR_TRANSMISSION_ID: {
 			float3 weight = sd->svm_closure_weight * mix_weight;
-			
+
 			if(sd->flag & SD_BACKFACING && sd->type & PRIMITIVE_ALL_CURVE) {
 				/* todo: giving a fixed weight here will cause issues when
 				 * mixing multiple BSDFS. energy will not be conserved and
@@ -1055,4 +1055,3 @@ ccl_device void svm_node_set_normal(KernelGlobals *kg, ShaderData *sd, float *st
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_color_util.h b/intern/cycles/kernel/svm/svm_color_util.h
index 258cdeb630e..d5945f915c6 100644
--- a/intern/cycles/kernel/svm/svm_color_util.h
+++ b/intern/cycles/kernel/svm/svm_color_util.h
@@ -60,7 +60,7 @@ ccl_device float3 svm_mix_overlay(float t, float3 col1, float3 col2)
 		outcol.z *= tm + 2.0f*t*col2.z;
 	else
 		outcol.z = 1.0f - (tm + 2.0f*t*(1.0f - col2.z))*(1.0f - outcol.z);
-	
+
 	return outcol;
 }
 
@@ -167,7 +167,7 @@ ccl_device float3 svm_mix_burn(float t, float3 col1, float3 col2)
 		outcol.z = 1.0f;
 	else
 		outcol.z = tmp;
-	
+
 	return outcol;
 }
 
@@ -180,7 +180,7 @@ ccl_device float3 svm_mix_hue(float t, float3 col1, float3 col2)
 	if(hsv2.y != 0.0f) {
 		float3 hsv = rgb_to_hsv(outcol);
 		hsv.x = hsv2.x;
-		float3 tmp = hsv_to_rgb(hsv); 
+		float3 tmp = hsv_to_rgb(hsv);
 
 		outcol = interp(outcol, tmp, t);
 	}
@@ -227,7 +227,7 @@ ccl_device float3 svm_mix_color(float t, float3 col1, float3 col2)
 		float3 hsv = rgb_to_hsv(outcol);
 		hsv.x = hsv2.x;
 		hsv.y = hsv2.y;
-		float3 tmp = hsv_to_rgb(hsv); 
+		float3 tmp = hsv_to_rgb(hsv);
 
 		outcol = interp(outcol, tmp, t);
 	}
@@ -303,4 +303,3 @@ ccl_device_inline float3 svm_brightness_contrast(float3 color, float brightness,
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_convert.h b/intern/cycles/kernel/svm/svm_convert.h
index c88ac57e20d..63b1dc6865e 100644
--- a/intern/cycles/kernel/svm/svm_convert.h
+++ b/intern/cycles/kernel/svm/svm_convert.h
@@ -69,4 +69,3 @@ ccl_device void svm_node_convert(KernelGlobals *kg, ShaderData *sd, float *stack
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_displace.h b/intern/cycles/kernel/svm/svm_displace.h
index 533b7f065e6..b85eb9c0458 100644
--- a/intern/cycles/kernel/svm/svm_displace.h
+++ b/intern/cycles/kernel/svm/svm_displace.h
@@ -160,4 +160,3 @@ ccl_device void svm_node_vector_displacement(KernelGlobals *kg, ShaderData *sd,
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_fresnel.h b/intern/cycles/kernel/svm/svm_fresnel.h
index 3703ec55015..99dda5fb170 100644
--- a/intern/cycles/kernel/svm/svm_fresnel.h
+++ b/intern/cycles/kernel/svm/svm_fresnel.h
@@ -24,7 +24,7 @@ ccl_device void svm_node_fresnel(ShaderData *sd, float *stack, uint ior_offset,
 	decode_node_uchar4(node, &normal_offset, &out_offset, NULL, NULL);
 	float eta = (stack_valid(ior_offset))? stack_load_float(stack, ior_offset): __uint_as_float(ior_value);
 	float3 normal_in = stack_valid(normal_offset)? stack_load_float3(stack, normal_offset): sd->N;
-	
+
 	eta = fmaxf(eta, 1e-5f);
 	eta = (sd->flag & SD_BACKFACING)? 1.0f/eta: eta;
 
@@ -71,4 +71,3 @@ ccl_device void svm_node_layer_weight(ShaderData *sd, float *stack, uint4 node)
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_geometry.h b/intern/cycles/kernel/svm/svm_geometry.h
index 81308d6f12b..05443772505 100644
--- a/intern/cycles/kernel/svm/svm_geometry.h
+++ b/intern/cycles/kernel/svm/svm_geometry.h
@@ -208,4 +208,3 @@ ccl_device void svm_node_hair_info(KernelGlobals *kg,
 #endif
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_gradient.h b/intern/cycles/kernel/svm/svm_gradient.h
index 74e36e70427..177e0506dee 100644
--- a/intern/cycles/kernel/svm/svm_gradient.h
+++ b/intern/cycles/kernel/svm/svm_gradient.h
@@ -36,7 +36,7 @@ ccl_device float svm_gradient(float3 p, NodeGradientType type)
 	else if(type == NODE_BLEND_EASING) {
 		float r = fminf(fmaxf(x, 0.0f), 1.0f);
 		float t = r*r;
-		
+
 		return (3.0f*t - 2.0f*t*r);
 	}
 	else if(type == NODE_BLEND_DIAGONAL) {
@@ -78,4 +78,3 @@ ccl_device void svm_node_tex_gradient(ShaderData *sd, float *stack, uint4 node)
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_hsv.h b/intern/cycles/kernel/svm/svm_hsv.h
index 3a1840c12e2..27127b85323 100644
--- a/intern/cycles/kernel/svm/svm_hsv.h
+++ b/intern/cycles/kernel/svm/svm_hsv.h
@@ -60,4 +60,3 @@ ccl_device void svm_node_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, ui
 CCL_NAMESPACE_END
 
 #endif /* __SVM_HSV_H__ */
-
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h
index 28565308867..81ee79c984e 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -203,4 +203,3 @@ ccl_device void svm_node_tex_environment(KernelGlobals *kg, ShaderData *sd, floa
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_invert.h b/intern/cycles/kernel/svm/svm_invert.h
index 5ce858e2e5d..57cc4281101 100644
--- a/intern/cycles/kernel/svm/svm_invert.h
+++ b/intern/cycles/kernel/svm/svm_invert.h
@@ -35,4 +35,3 @@ ccl_device void svm_node_invert(ShaderData *sd, float *stack, uint in_fac, uint
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_light_path.h b/intern/cycles/kernel/svm/svm_light_path.h
index 1492e358608..dd4390057cf 100644
--- a/intern/cycles/kernel/svm/svm_light_path.h
+++ b/intern/cycles/kernel/svm/svm_light_path.h
@@ -74,4 +74,3 @@ ccl_device void svm_node_light_falloff(ShaderData *sd, float *stack, uint4 node)
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_magic.h b/intern/cycles/kernel/svm/svm_magic.h
index ac87c77d719..6afaff37acd 100644
--- a/intern/cycles/kernel/svm/svm_magic.h
+++ b/intern/cycles/kernel/svm/svm_magic.h
@@ -109,4 +109,3 @@ ccl_device void svm_node_tex_magic(KernelGlobals *kg, ShaderData *sd, float *sta
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_mapping.h b/intern/cycles/kernel/svm/svm_mapping.h
index 42a7ae9946f..86181283821 100644
--- a/intern/cycles/kernel/svm/svm_mapping.h
+++ b/intern/cycles/kernel/svm/svm_mapping.h
@@ -43,4 +43,3 @@ ccl_device void svm_node_min_max(KernelGlobals *kg, ShaderData *sd, float *stack
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_math.h b/intern/cycles/kernel/svm/svm_math.h
index d633e54ed8d..c9a838361cd 100644
--- a/intern/cycles/kernel/svm/svm_math.h
+++ b/intern/cycles/kernel/svm/svm_math.h
@@ -47,4 +47,3 @@ ccl_device void svm_node_vector_math(KernelGlobals *kg, ShaderData *sd, float *s
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_math_util.h b/intern/cycles/kernel/svm/svm_math_util.h
index caf0addbf35..04864bd610a 100644
--- a/intern/cycles/kernel/svm/svm_math_util.h
+++ b/intern/cycles/kernel/svm/svm_math_util.h
@@ -98,7 +98,7 @@ ccl_device float svm_math(NodeMath type, float Fac1, float Fac2)
 		Fac = saturate(Fac1);
 	else
 		Fac = 0.0f;
-	
+
 	return Fac;
 }
 
@@ -180,4 +180,3 @@ ccl_device_inline float3 svm_math_gamma_color(float3 color, float gamma)
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_mix.h b/intern/cycles/kernel/svm/svm_mix.h
index 022a68d1928..903a4dacebf 100644
--- a/intern/cycles/kernel/svm/svm_mix.h
+++ b/intern/cycles/kernel/svm/svm_mix.h
@@ -32,4 +32,3 @@ ccl_device void svm_node_mix(KernelGlobals *kg, ShaderData *sd, float *stack, ui
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_musgrave.h b/intern/cycles/kernel/svm/svm_musgrave.h
index 09eba31945e..5d9e12628ca 100644
--- a/intern/cycles/kernel/svm/svm_musgrave.h
+++ b/intern/cycles/kernel/svm/svm_musgrave.h
@@ -193,7 +193,7 @@ ccl_device float svm_musgrave(NodeMusgraveType type, float dimension, float lacu
 		return intensity*noise_musgrave_ridged_multi_fractal(p, dimension, lacunarity, octaves, offset, gain);
 	else if(type == NODE_MUSGRAVE_HETERO_TERRAIN)
 		return intensity*noise_musgrave_hetero_terrain(p, dimension, lacunarity, octaves, offset);
-	
+
 	return 0.0f;
 }
 
@@ -232,4 +232,3 @@ ccl_device void svm_node_tex_musgrave(KernelGlobals *kg, ShaderData *sd, float *
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/svm_noise.h
index 3f75ae5c04e..38074f0faff 100644
--- a/intern/cycles/kernel/svm/svm_noise.h
+++ b/intern/cycles/kernel/svm/svm_noise.h
@@ -5,7 +5,7 @@
  * All Rights Reserved.
  *
  * Modifications Copyright 2011, Blender Foundation.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
@@ -120,7 +120,7 @@ ccl_device int imod(int a, int b)
 	return a < 0 ? a + b : a;
 }
 
-ccl_device uint phash(int kx, int ky, int kz, int3 p) 
+ccl_device uint phash(int kx, int ky, int kz, int3 p)
 {
 	return hash(imod(kx, p.x), imod(ky, p.y), imod(kz, p.z));
 }
@@ -334,4 +334,3 @@ ccl_device ssef cellnoise_color(const ssef& p)
 #endif
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_noisetex.h b/intern/cycles/kernel/svm/svm_noisetex.h
index 0347ab7b193..c02940f96d6 100644
--- a/intern/cycles/kernel/svm/svm_noisetex.h
+++ b/intern/cycles/kernel/svm/svm_noisetex.h
@@ -57,4 +57,3 @@ ccl_device void svm_node_tex_noise(KernelGlobals *kg, ShaderData *sd, float *sta
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_normal.h b/intern/cycles/kernel/svm/svm_normal.h
index 53abef71012..fe46d79fe15 100644
--- a/intern/cycles/kernel/svm/svm_normal.h
+++ b/intern/cycles/kernel/svm/svm_normal.h
@@ -36,4 +36,3 @@ ccl_device void svm_node_normal(KernelGlobals *kg, ShaderData *sd, float *stack,
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_ramp.h b/intern/cycles/kernel/svm/svm_ramp.h
index 368740f64c7..a3e4b6e87cd 100644
--- a/intern/cycles/kernel/svm/svm_ramp.h
+++ b/intern/cycles/kernel/svm/svm_ramp.h
@@ -109,4 +109,3 @@ ccl_device void svm_node_curves(KernelGlobals *kg, ShaderData *sd, float *stack,
 CCL_NAMESPACE_END
 
 #endif /* __SVM_RAMP_H__ */
-
diff --git a/intern/cycles/kernel/svm/svm_ramp_util.h b/intern/cycles/kernel/svm/svm_ramp_util.h
index b0adadae9b7..a67689ff9d1 100644
--- a/intern/cycles/kernel/svm/svm_ramp_util.h
+++ b/intern/cycles/kernel/svm/svm_ramp_util.h
@@ -96,4 +96,3 @@ ccl_device float float_ramp_lookup(const float *ramp,
 CCL_NAMESPACE_END
 
 #endif /* __SVM_RAMP_UTIL_H__ */
-
diff --git a/intern/cycles/kernel/svm/svm_sepcomb_hsv.h b/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
index 6f51b163756..1096aed2d97 100644
--- a/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
+++ b/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
@@ -20,11 +20,11 @@ ccl_device void svm_node_combine_hsv(KernelGlobals *kg, ShaderData *sd, float *s
 {
 	uint4 node1 = read_node(kg, offset);
 	uint color_out = node1.y;
-	
+
 	float hue = stack_load_float(stack, hue_in);
 	float saturation = stack_load_float(stack, saturation_in);
 	float value = stack_load_float(stack, value_in);
-	
+
 	/* Combine, and convert back to RGB */
 	float3 color = hsv_to_rgb(make_float3(hue, saturation, value));
 
@@ -36,9 +36,9 @@ ccl_device void svm_node_separate_hsv(KernelGlobals *kg, ShaderData *sd, float *
 {
 	uint4 node1 = read_node(kg, offset);
 	uint value_out = node1.y;
-	
+
 	float3 color = stack_load_float3(stack, color_in);
-	
+
 	/* Convert to HSV */
 	color = rgb_to_hsv(color);
 
@@ -51,4 +51,3 @@ ccl_device void svm_node_separate_hsv(KernelGlobals *kg, ShaderData *sd, float *
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_sepcomb_vector.h b/intern/cycles/kernel/svm/svm_sepcomb_vector.h
index 63570dd6942..0d85c0d6f1d 100644
--- a/intern/cycles/kernel/svm/svm_sepcomb_vector.h
+++ b/intern/cycles/kernel/svm/svm_sepcomb_vector.h
@@ -41,4 +41,3 @@ ccl_device void svm_node_separate_vector(ShaderData *sd, float *stack, uint ivec
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_sky.h b/intern/cycles/kernel/svm/svm_sky.h
index b83a7168541..092f6e045d6 100644
--- a/intern/cycles/kernel/svm/svm_sky.h
+++ b/intern/cycles/kernel/svm/svm_sky.h
@@ -110,7 +110,7 @@ ccl_device void svm_node_tex_sky(KernelGlobals *kg, ShaderData *sd, float *stack
 	/* Define variables */
 	float sunphi, suntheta, radiance_x, radiance_y, radiance_z;
 	float config_x[9], config_y[9], config_z[9];
-	
+
 	/* Load data */
 	uint dir_offset = node.y;
 	uint out_offset = node.z;
@@ -121,49 +121,49 @@ ccl_device void svm_node_tex_sky(KernelGlobals *kg, ShaderData *sd, float *stack
 	suntheta = data.y;
 	radiance_x = data.z;
 	radiance_y = data.w;
-	
+
 	data = read_node_float(kg, offset);
 	radiance_z = data.x;
 	config_x[0] = data.y;
 	config_x[1] = data.z;
 	config_x[2] = data.w;
-	
+
 	data = read_node_float(kg, offset);
 	config_x[3] = data.x;
 	config_x[4] = data.y;
 	config_x[5] = data.z;
 	config_x[6] = data.w;
-	
+
 	data = read_node_float(kg, offset);
 	config_x[7] = data.x;
 	config_x[8] = data.y;
 	config_y[0] = data.z;
 	config_y[1] = data.w;
-	
+
 	data = read_node_float(kg, offset);
 	config_y[2] = data.x;
 	config_y[3] = data.y;
 	config_y[4] = data.z;
 	config_y[5] = data.w;
-	
+
 	data = read_node_float(kg, offset);
 	config_y[6] = data.x;
 	config_y[7] = data.y;
 	config_y[8] = data.z;
 	config_z[0] = data.w;
-	
+
 	data = read_node_float(kg, offset);
 	config_z[1] = data.x;
 	config_z[2] = data.y;
 	config_z[3] = data.z;
 	config_z[4] = data.w;
-	
+
 	data = read_node_float(kg, offset);
 	config_z[5] = data.x;
 	config_z[6] = data.y;
 	config_z[7] = data.z;
 	config_z[8] = data.w;
-	
+
 	float3 dir = stack_load_float3(stack, dir_offset);
 	float3 f;
 
@@ -183,4 +183,3 @@ ccl_device void svm_node_tex_sky(KernelGlobals *kg, ShaderData *sd, float *stack
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/svm_tex_coord.h
index 6ff39e5f587..7c207083929 100644
--- a/intern/cycles/kernel/svm/svm_tex_coord.h
+++ b/intern/cycles/kernel/svm/svm_tex_coord.h
@@ -323,7 +323,7 @@ ccl_device void svm_node_normal_map(KernelGlobals *kg, ShaderData *sd, float *st
 			color.y = -color.y;
 			color.z = -color.z;
 		}
-	
+
 		/* object, world space */
 		N = color;
 
@@ -392,4 +392,3 @@ ccl_device void svm_node_tangent(KernelGlobals *kg, ShaderData *sd, float *stack
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_texture.h b/intern/cycles/kernel/svm/svm_texture.h
index dcb00f7dd55..57729817bdc 100644
--- a/intern/cycles/kernel/svm/svm_texture.h
+++ b/intern/cycles/kernel/svm/svm_texture.h
@@ -61,4 +61,3 @@ ccl_device_noinline float noise_turbulence(float3 p, float octaves, int hard)
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index 54db18cd7bb..b94a83b6712 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -24,7 +24,7 @@ CCL_NAMESPACE_BEGIN
 /* SVM stack has a fixed size */
 #define SVM_STACK_SIZE 255
 /* SVM stack offsets with this value indicate that it's not on the stack */
-#define SVM_STACK_INVALID 255 
+#define SVM_STACK_INVALID 255
 
 #define SVM_BUMP_EVAL_STATE_SIZE 9
 
@@ -505,4 +505,3 @@ typedef enum ClosureType {
 CCL_NAMESPACE_END
 
 #endif /*  __SVM_TYPES_H__ */
-
diff --git a/intern/cycles/kernel/svm/svm_value.h b/intern/cycles/kernel/svm/svm_value.h
index c1c2b539df3..062aee2956e 100644
--- a/intern/cycles/kernel/svm/svm_value.h
+++ b/intern/cycles/kernel/svm/svm_value.h
@@ -33,4 +33,3 @@ ccl_device void svm_node_value_v(KernelGlobals *kg, ShaderData *sd, float *stack
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_vector_transform.h b/intern/cycles/kernel/svm/svm_vector_transform.h
index 4e92f27acdb..f6ec36ba41f 100644
--- a/intern/cycles/kernel/svm/svm_vector_transform.h
+++ b/intern/cycles/kernel/svm/svm_vector_transform.h
@@ -22,20 +22,20 @@ ccl_device void svm_node_vector_transform(KernelGlobals *kg, ShaderData *sd, flo
 {
 	uint itype, ifrom, ito;
 	uint vector_in, vector_out;
-	
+
 	decode_node_uchar4(node.y, &itype, &ifrom, &ito, NULL);
 	decode_node_uchar4(node.z, &vector_in, &vector_out, NULL, NULL);
-	
+
 	float3 in = stack_load_float3(stack, vector_in);
-	
+
 	NodeVectorTransformType type = (NodeVectorTransformType)itype;
 	NodeVectorTransformConvertSpace from = (NodeVectorTransformConvertSpace)ifrom;
 	NodeVectorTransformConvertSpace to = (NodeVectorTransformConvertSpace)ito;
-	
+
 	Transform tfm;
 	bool is_object = (sd->object != OBJECT_NONE);
 	bool is_direction = (type == NODE_VECTOR_TRANSFORM_TYPE_VECTOR || type == NODE_VECTOR_TRANSFORM_TYPE_NORMAL);
-	
+
 	/* From world */
 	if(from == NODE_VECTOR_TRANSFORM_CONVERT_SPACE_WORLD) {
 		if(to == NODE_VECTOR_TRANSFORM_CONVERT_SPACE_CAMERA) {
@@ -52,7 +52,7 @@ ccl_device void svm_node_vector_transform(KernelGlobals *kg, ShaderData *sd, flo
 				object_inverse_position_transform(kg, sd, &in);
 		}
 	}
-	
+
 	/* From camera */
 	else if(from == NODE_VECTOR_TRANSFORM_CONVERT_SPACE_CAMERA) {
 		if(to == NODE_VECTOR_TRANSFORM_CONVERT_SPACE_WORLD || to == NODE_VECTOR_TRANSFORM_CONVERT_SPACE_OBJECT) {
@@ -69,7 +69,7 @@ ccl_device void svm_node_vector_transform(KernelGlobals *kg, ShaderData *sd, flo
 				object_inverse_position_transform(kg, sd, &in);
 		}
 	}
-	
+
 	/* From object */
 	else if(from == NODE_VECTOR_TRANSFORM_CONVERT_SPACE_OBJECT) {
 		if((to == NODE_VECTOR_TRANSFORM_CONVERT_SPACE_WORLD || to == NODE_VECTOR_TRANSFORM_CONVERT_SPACE_CAMERA) && is_object) {
@@ -86,11 +86,11 @@ ccl_device void svm_node_vector_transform(KernelGlobals *kg, ShaderData *sd, flo
 				in = transform_point(&tfm, in);
 		}
 	}
-	
+
 	/* Normalize Normal */
 	if(type == NODE_VECTOR_TRANSFORM_TYPE_NORMAL)
 		in = normalize(in);
-	
+
 	/* Output */
 	if(stack_valid(vector_out)) {
 		stack_store_float3(stack, vector_out, in);
@@ -98,4 +98,3 @@ ccl_device void svm_node_vector_transform(KernelGlobals *kg, ShaderData *sd, flo
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_voronoi.h b/intern/cycles/kernel/svm/svm_voronoi.h
index d612d7e973f..9bfb182544b 100644
--- a/intern/cycles/kernel/svm/svm_voronoi.h
+++ b/intern/cycles/kernel/svm/svm_voronoi.h
@@ -137,4 +137,3 @@ ccl_device void svm_node_tex_voronoi(KernelGlobals *kg, ShaderData *sd, float *s
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_wave.h b/intern/cycles/kernel/svm/svm_wave.h
index 6ce69458a03..7b60ab6e6ae 100644
--- a/intern/cycles/kernel/svm/svm_wave.h
+++ b/intern/cycles/kernel/svm/svm_wave.h
@@ -63,4 +63,3 @@ ccl_device void svm_node_tex_wave(KernelGlobals *kg, ShaderData *sd, float *stac
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_wavelength.h b/intern/cycles/kernel/svm/svm_wavelength.h
index 62e026278ac..e935fd20690 100644
--- a/intern/cycles/kernel/svm/svm_wavelength.h
+++ b/intern/cycles/kernel/svm/svm_wavelength.h
@@ -5,7 +5,7 @@
  * All Rights Reserved.
  *
  * Modifications Copyright 2013, Blender Foundation.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
@@ -71,12 +71,12 @@ ccl_static_constant float cie_colour_match[81][3] = {
 };
 
 ccl_device void svm_node_wavelength(KernelGlobals *kg, ShaderData *sd, float *stack, uint wavelength, uint color_out)
-{	
+{
 	float lambda_nm = stack_load_float(stack, wavelength);
 	float ii = (lambda_nm-380.0f) * (1.0f/5.0f);  // scaled 0..80
 	int i = float_to_int(ii);
 	float3 color;
-	
+
 	if(i < 0 || i >= 80) {
 		color = make_float3(0.0f, 0.0f, 0.0f);
 	}
@@ -85,10 +85,10 @@ ccl_device void svm_node_wavelength(KernelGlobals *kg, ShaderData *sd, float *st
 		ccl_constant float *c = cie_colour_match[i];
 		color = interp(make_float3(c[0], c[1], c[2]), make_float3(c[3], c[4], c[5]), ii);
 	}
-	
+
 	color = xyz_to_rgb(kg, color);
 	color *= 1.0f/2.52f;	// Empirical scale from lg to make all comps <= 1
-	
+
 	/* Clamp to zero if values are smaller */
 	color = max(color, make_float3(0.0f, 0.0f, 0.0f));
 
@@ -96,4 +96,3 @@ ccl_device void svm_node_wavelength(KernelGlobals *kg, ShaderData *sd, float *st
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/svm/svm_wireframe.h b/intern/cycles/kernel/svm/svm_wireframe.h
index 3c6353c8001..35df9e8a0e7 100644
--- a/intern/cycles/kernel/svm/svm_wireframe.h
+++ b/intern/cycles/kernel/svm/svm_wireframe.h
@@ -5,7 +5,7 @@
  * All Rights Reserved.
  *
  * Modifications Copyright 2013, Blender Foundation.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
@@ -134,4 +134,3 @@ ccl_device void svm_node_wireframe(KernelGlobals *kg,
 }
 
 CCL_NAMESPACE_END
-