From 1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 6 Jul 2018 10:17:58 +0200
Subject: Cleanup: strip trailing space for cycles

---
 intern/cycles/kernel/closure/bsdf.h                    |  1 -
 intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h  |  2 +-
 intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h   |  5 ++---
 intern/cycles/kernel/closure/bsdf_diffuse.h            |  3 +--
 intern/cycles/kernel/closure/bsdf_diffuse_ramp.h       |  4 ++--
 intern/cycles/kernel/closure/bsdf_hair.h               |  1 -
 intern/cycles/kernel/closure/bsdf_microfacet.h         | 11 +++++------
 intern/cycles/kernel/closure/bsdf_phong_ramp.h         | 10 +++++-----
 intern/cycles/kernel/closure/bsdf_principled_diffuse.h |  2 --
 intern/cycles/kernel/closure/bsdf_principled_sheen.h   |  2 --
 intern/cycles/kernel/closure/bsdf_reflection.h         |  1 -
 intern/cycles/kernel/closure/bsdf_refraction.h         |  1 -
 intern/cycles/kernel/closure/bsdf_toon.h               | 11 +++++------
 intern/cycles/kernel/closure/bsdf_transparent.h        |  1 -
 intern/cycles/kernel/closure/bsdf_util.h               |  5 ++---
 intern/cycles/kernel/closure/bssrdf.h                  |  1 -
 intern/cycles/kernel/closure/emissive.h                |  3 +--
 intern/cycles/kernel/closure/volume.h                  |  2 +-
 18 files changed, 25 insertions(+), 41 deletions(-)

(limited to 'intern/cycles/kernel/closure')

diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h
index c1b02cd4be1..f191b812f11 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -486,4 +486,3 @@ ccl_device bool bsdf_merge(ShaderClosure *a, ShaderClosure *b)
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h b/intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h
index b6c896c754b..ff238b7a834 100644
--- a/intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h
+++ b/intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h
@@ -117,7 +117,7 @@ ccl_device_forceinline float3 bsdf_ashikhmin_shirley_eval_reflect(
 				lobe = 1.0f;
 			}
 			float norm = sqrtf((n_x + 1.0f)*(n_y + 1.0f)) / (8.0f * M_PI_F);
-			
+
 			out = NdotO * norm * lobe * pump;
 			*pdf = norm * lobe / HdotI;
 		}
diff --git a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
index a5ba2cb2972..b0bdea723b9 100644
--- a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
+++ b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.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:
@@ -46,7 +46,7 @@ ccl_device int bsdf_ashikhmin_velvet_setup(VelvetBsdf *bsdf)
 {
 	float sigma = fmaxf(bsdf->sigma, 0.01f);
 	bsdf->invsigma2 = 1.0f/(sigma * sigma);
-	
+
 	bsdf->type = CLOSURE_BSDF_ASHIKHMIN_VELVET_ID;
 
 	return SD_BSDF|SD_BSDF_HAS_EVAL;
@@ -159,4 +159,3 @@ ccl_device int bsdf_ashikhmin_velvet_sample(const ShaderClosure *sc, float3 Ng,
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_ASHIKHMIN_VELVET_H__ */
-
diff --git a/intern/cycles/kernel/closure/bsdf_diffuse.h b/intern/cycles/kernel/closure/bsdf_diffuse.h
index ec6f1f20996..ee6d4cdf2df 100644
--- a/intern/cycles/kernel/closure/bsdf_diffuse.h
+++ b/intern/cycles/kernel/closure/bsdf_diffuse.h
@@ -88,7 +88,7 @@ ccl_device int bsdf_diffuse_sample(const ShaderClosure *sc, float3 Ng, float3 I,
 	}
 	else
 		*pdf = 0.0f;
-	
+
 	return LABEL_REFLECT|LABEL_DIFFUSE;
 }
 
@@ -140,4 +140,3 @@ ccl_device int bsdf_translucent_sample(const ShaderClosure *sc, float3 Ng, float
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_DIFFUSE_H__ */
-
diff --git a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
index 24f40af46a3..35bb2fdf0e8 100644
--- a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
+++ b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
@@ -46,7 +46,7 @@ typedef ccl_addr_space struct DiffuseRampBsdf {
 ccl_device float3 bsdf_diffuse_ramp_get_color(const float3 colors[8], float pos)
 {
 	int MAXCOLORS = 8;
-	
+
 	float npos = pos * (float)(MAXCOLORS - 1);
 	int ipos = float_to_int(npos);
 	if(ipos < 0)
@@ -99,7 +99,7 @@ ccl_device int bsdf_diffuse_ramp_sample(const ShaderClosure *sc, float3 Ng, floa
 	}
 	else
 		*pdf = 0.0f;
-	
+
 	return LABEL_REFLECT|LABEL_DIFFUSE;
 }
 
diff --git a/intern/cycles/kernel/closure/bsdf_hair.h b/intern/cycles/kernel/closure/bsdf_hair.h
index daaa26dc6ad..7b44a23f05b 100644
--- a/intern/cycles/kernel/closure/bsdf_hair.h
+++ b/intern/cycles/kernel/closure/bsdf_hair.h
@@ -278,4 +278,3 @@ ccl_device int bsdf_hair_transmission_sample(const ShaderClosure *sc, float3 Ng,
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_HAIR_H__ */
-
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h
index 2dd59354058..e74d5ebaa42 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@ -231,7 +231,7 @@ ccl_device_forceinline float3 microfacet_sample_stretched(
 
 	/* 5. compute normal */
 	return normalize(make_float3(-slope_x, -slope_y, 1.0f));
-} 
+}
 
 /* Calculate the reflection color
  *
@@ -434,7 +434,7 @@ ccl_device float3 bsdf_microfacet_ggx_eval_reflect(const ShaderClosure *sc, cons
 
 			/* eq. 34: now calculate G1(i,m) and G1(o,m) */
 			G1o = 2 / (1 + safe_sqrtf(1 + alpha2 * (1 - cosNO * cosNO) / (cosNO * cosNO)));
-			G1i = 2 / (1 + safe_sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI))); 
+			G1i = 2 / (1 + safe_sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI)));
 		}
 		else {
 			/* anisotropic */
@@ -535,7 +535,7 @@ ccl_device float3 bsdf_microfacet_ggx_eval_transmit(const ShaderClosure *sc, con
 
 	/* eq. 34: now calculate G1(i,m) and G1(o,m) */
 	G1o = 2 / (1 + safe_sqrtf(1 + alpha2 * (1 - cosNO * cosNO) / (cosNO * cosNO)));
-	G1i = 2 / (1 + safe_sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI))); 
+	G1i = 2 / (1 + safe_sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI)));
 
 	float G = G1o * G1i;
 
@@ -706,7 +706,7 @@ ccl_device int bsdf_microfacet_ggx_sample(KernelGlobals *kg, const ShaderClosure
 				dIdx, dIdy, &dRdx, &dRdy, &dTdx, &dTdy,
 #endif
 				&inside);
-			
+
 			if(!inside && fresnel != 1.0f) {
 
 				*omega_in = T;
@@ -733,7 +733,7 @@ ccl_device int bsdf_microfacet_ggx_sample(KernelGlobals *kg, const ShaderClosure
 					float cosNI = dot(N, *omega_in);
 
 					/* eq. 34: now calculate G1(i,m) */
-					float G1i = 2 / (1 + safe_sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI))); 
+					float G1i = 2 / (1 + safe_sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI)));
 
 					/* eq. 21 */
 					float cosHI = dot(m, *omega_in);
@@ -1125,4 +1125,3 @@ ccl_device int bsdf_microfacet_beckmann_sample(KernelGlobals *kg, const ShaderCl
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_MICROFACET_H__ */
-
diff --git a/intern/cycles/kernel/closure/bsdf_phong_ramp.h b/intern/cycles/kernel/closure/bsdf_phong_ramp.h
index 420f94755ee..91c7803346d 100644
--- a/intern/cycles/kernel/closure/bsdf_phong_ramp.h
+++ b/intern/cycles/kernel/closure/bsdf_phong_ramp.h
@@ -47,7 +47,7 @@ typedef ccl_addr_space struct PhongRampBsdf {
 ccl_device float3 bsdf_phong_ramp_get_color(const float3 colors[8], float pos)
 {
 	int MAXCOLORS = 8;
-	
+
 	float npos = pos * (float)(MAXCOLORS - 1);
 	int ipos = float_to_int(npos);
 	if(ipos < 0)
@@ -71,7 +71,7 @@ ccl_device float3 bsdf_phong_ramp_eval_reflect(const ShaderClosure *sc, const fl
 	float m_exponent = bsdf->exponent;
 	float cosNI = dot(bsdf->N, omega_in);
 	float cosNO = dot(bsdf->N, I);
-	
+
 	if(cosNI > 0 && cosNO > 0) {
 		// reflect the view vector
 		float3 R = (2 * cosNO) * bsdf->N - I;
@@ -84,7 +84,7 @@ ccl_device float3 bsdf_phong_ramp_eval_reflect(const ShaderClosure *sc, const fl
 			return bsdf_phong_ramp_get_color(bsdf->colors, cosp) * out;
 		}
 	}
-	
+
 	return make_float3(0.0f, 0.0f, 0.0f);
 }
 
@@ -98,7 +98,7 @@ ccl_device int bsdf_phong_ramp_sample(const ShaderClosure *sc, float3 Ng, float3
 	const PhongRampBsdf *bsdf = (const PhongRampBsdf*)sc;
 	float cosNO = dot(bsdf->N, I);
 	float m_exponent = bsdf->exponent;
-	
+
 	if(cosNO > 0) {
 		// reflect the view vector
 		float3 R = (2 * cosNO) * bsdf->N - I;
@@ -107,7 +107,7 @@ ccl_device int bsdf_phong_ramp_sample(const ShaderClosure *sc, float3 Ng, float3
 		*domega_in_dx = (2 * dot(bsdf->N, dIdx)) * bsdf->N - dIdx;
 		*domega_in_dy = (2 * dot(bsdf->N, dIdy)) * bsdf->N - dIdy;
 #endif
-		
+
 		float3 T, B;
 		make_orthonormals (R, &T, &B);
 		float phi = M_2PI_F * randu;
diff --git a/intern/cycles/kernel/closure/bsdf_principled_diffuse.h b/intern/cycles/kernel/closure/bsdf_principled_diffuse.h
index f8ca64293b0..83be2b35a00 100644
--- a/intern/cycles/kernel/closure/bsdf_principled_diffuse.h
+++ b/intern/cycles/kernel/closure/bsdf_principled_diffuse.h
@@ -123,5 +123,3 @@ ccl_device int bsdf_principled_diffuse_sample(const ShaderClosure *sc,
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_PRINCIPLED_DIFFUSE_H__ */
-
-
diff --git a/intern/cycles/kernel/closure/bsdf_principled_sheen.h b/intern/cycles/kernel/closure/bsdf_principled_sheen.h
index f4476bfecd0..8b7c4399516 100644
--- a/intern/cycles/kernel/closure/bsdf_principled_sheen.h
+++ b/intern/cycles/kernel/closure/bsdf_principled_sheen.h
@@ -109,5 +109,3 @@ ccl_device int bsdf_principled_sheen_sample(const ShaderClosure *sc,
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_PRINCIPLED_SHEEN_H__ */
-
-
diff --git a/intern/cycles/kernel/closure/bsdf_reflection.h b/intern/cycles/kernel/closure/bsdf_reflection.h
index 1d21614ecee..b33b6e3597b 100644
--- a/intern/cycles/kernel/closure/bsdf_reflection.h
+++ b/intern/cycles/kernel/closure/bsdf_reflection.h
@@ -78,4 +78,3 @@ ccl_device int bsdf_reflection_sample(const ShaderClosure *sc, float3 Ng, float3
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_REFLECTION_H__ */
-
diff --git a/intern/cycles/kernel/closure/bsdf_refraction.h b/intern/cycles/kernel/closure/bsdf_refraction.h
index 050a4e76fa9..b181650e928 100644
--- a/intern/cycles/kernel/closure/bsdf_refraction.h
+++ b/intern/cycles/kernel/closure/bsdf_refraction.h
@@ -87,4 +87,3 @@ ccl_device int bsdf_refraction_sample(const ShaderClosure *sc, float3 Ng, float3
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_REFRACTION_H__ */
-
diff --git a/intern/cycles/kernel/closure/bsdf_toon.h b/intern/cycles/kernel/closure/bsdf_toon.h
index d8b6d8ddead..6d8074b7130 100644
--- a/intern/cycles/kernel/closure/bsdf_toon.h
+++ b/intern/cycles/kernel/closure/bsdf_toon.h
@@ -73,7 +73,7 @@ ccl_device float3 bsdf_toon_get_intensity(float max_angle, float smooth, float a
 		is = (1.0f - (angle - max_angle)/smooth);
 	else
 		is = 0.0f;
-	
+
 	return make_float3(is, is, is);
 }
 
@@ -90,7 +90,7 @@ ccl_device float3 bsdf_diffuse_toon_eval_reflect(const ShaderClosure *sc, const
 	float angle = safe_acosf(fmaxf(dot(bsdf->N, omega_in), 0.0f));
 
 	float3 eval = bsdf_toon_get_intensity(max_angle, smooth, angle);
-	
+
 	if(eval.x > 0.0f) {
 		float sample_angle = bsdf_toon_get_sample_angle(max_angle, smooth);
 
@@ -152,7 +152,7 @@ ccl_device float3 bsdf_glossy_toon_eval_reflect(const ShaderClosure *sc, const f
 	float smooth = bsdf->smooth*M_PI_2_F;
 	float cosNI = dot(bsdf->N, omega_in);
 	float cosNO = dot(bsdf->N, I);
-	
+
 	if(cosNI > 0 && cosNO > 0) {
 		/* reflect the view vector */
 		float3 R = (2 * cosNO) * bsdf->N - I;
@@ -166,7 +166,7 @@ ccl_device float3 bsdf_glossy_toon_eval_reflect(const ShaderClosure *sc, const f
 		*pdf = 0.5f * M_1_PI_F / (1.0f - cosf(sample_angle));
 		return *pdf * eval;
 	}
-	
+
 	return make_float3(0.0f, 0.0f, 0.0f);
 }
 
@@ -181,7 +181,7 @@ ccl_device int bsdf_glossy_toon_sample(const ShaderClosure *sc, float3 Ng, float
 	float max_angle = bsdf->size*M_PI_2_F;
 	float smooth = bsdf->smooth*M_PI_2_F;
 	float cosNO = dot(bsdf->N, I);
-	
+
 	if(cosNO > 0) {
 		/* reflect the view vector */
 		float3 R = (2 * cosNO) * bsdf->N - I;
@@ -216,4 +216,3 @@ ccl_device int bsdf_glossy_toon_sample(const ShaderClosure *sc, float3 Ng, float
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_TOON_H__ */
-
diff --git a/intern/cycles/kernel/closure/bsdf_transparent.h b/intern/cycles/kernel/closure/bsdf_transparent.h
index 8fc7ef4dd4f..f788dbcd0ff 100644
--- a/intern/cycles/kernel/closure/bsdf_transparent.h
+++ b/intern/cycles/kernel/closure/bsdf_transparent.h
@@ -107,4 +107,3 @@ ccl_device int bsdf_transparent_sample(const ShaderClosure *sc, float3 Ng, float
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_TRANSPARENT_H__ */
-
diff --git a/intern/cycles/kernel/closure/bsdf_util.h b/intern/cycles/kernel/closure/bsdf_util.h
index 3dc15d5791c..b080e025d16 100644
--- a/intern/cycles/kernel/closure/bsdf_util.h
+++ b/intern/cycles/kernel/closure/bsdf_util.h
@@ -62,14 +62,14 @@ ccl_device float fresnel_dielectric(
 		Nn   = -N;
 		*is_inside = true;
 	}
-	
+
 	// compute reflection
 	*R = (2 * cos)* Nn - I;
 #ifdef __RAY_DIFFERENTIALS__
 	*dRdx = (2 * dot(Nn, dIdx)) * Nn - dIdx;
 	*dRdy = (2 * dot(Nn, dIdy)) * Nn - dIdy;
 #endif
-	
+
 	float arg = 1 -(neta * neta *(1 -(cos * cos)));
 	if(arg < 0) {
 		*T = make_float3(0.0f, 0.0f, 0.0f);
@@ -159,4 +159,3 @@ ccl_device_forceinline float3 interpolate_fresnel_color(float3 L, float3 H, floa
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_UTIL_H__ */
-
diff --git a/intern/cycles/kernel/closure/bssrdf.h b/intern/cycles/kernel/closure/bssrdf.h
index 8578767b07e..ba0c6ae8c61 100644
--- a/intern/cycles/kernel/closure/bssrdf.h
+++ b/intern/cycles/kernel/closure/bssrdf.h
@@ -500,4 +500,3 @@ ccl_device_forceinline float bssrdf_pdf(const ShaderClosure *sc, float r)
 CCL_NAMESPACE_END
 
 #endif /* __KERNEL_BSSRDF_H__ */
-
diff --git a/intern/cycles/kernel/closure/emissive.h b/intern/cycles/kernel/closure/emissive.h
index e709ca9a372..a7f4a2a7327 100644
--- a/intern/cycles/kernel/closure/emissive.h
+++ b/intern/cycles/kernel/closure/emissive.h
@@ -76,9 +76,8 @@ ccl_device void emissive_sample(const float3 Ng, float randu, float randv,
 ccl_device float3 emissive_simple_eval(const float3 Ng, const float3 I)
 {
 	float res = emissive_pdf(Ng, I);
-	
+
 	return make_float3(res, res, res);
 }
 
 CCL_NAMESPACE_END
-
diff --git a/intern/cycles/kernel/closure/volume.h b/intern/cycles/kernel/closure/volume.h
index da791e9aa73..872d06c936a 100644
--- a/intern/cycles/kernel/closure/volume.h
+++ b/intern/cycles/kernel/closure/volume.h
@@ -51,7 +51,7 @@ ccl_device float single_peaked_henyey_greenstein(float cos_theta, float g)
 ccl_device int volume_henyey_greenstein_setup(HenyeyGreensteinVolume *volume)
 {
 	volume->type = CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID;
-	
+
 	/* clamp anisotropy to avoid delta function */
 	volume->g = signf(volume->g) * min(fabsf(volume->g), 1.0f - 1e-3f);
 
-- 
cgit v1.2.3