Cycles: Cleanup, spacing after preprocessor

It is supposed to be two spaces before comment stating which if else/endif statements corresponds to. Was mainly violated in the header guards.
2018-11-09 11:34:54 +01:00
parent 33039a4602
commit cb4b5e12ab
176 changed files with 244 additions and 244 deletions
--- a/intern/cycles/app/cycles_xml.h
+++ b/intern/cycles/app/cycles_xml.h
@@ -29,4 +29,4 @@ void xml_read_file(Scene *scene, const char *filepath);

 CCL_NAMESPACE_END

-#endif /* __CYCLES_XML_H__ */
+#endif  /* __CYCLES_XML_H__ */
--- a/intern/cycles/blender/CCL_api.h
+++ b/intern/cycles/blender/CCL_api.h
@@ -33,4 +33,4 @@ void CCL_logging_verbosity_set(int verbosity);
 }
 #endif

-#endif /* __CCL_API_H__ */
+#endif  /* __CCL_API_H__ */
--- a/intern/cycles/blender/blender_object_cull.h
+++ b/intern/cycles/blender/blender_object_cull.h
@@ -46,4 +46,4 @@ private:

 CCL_NAMESPACE_END

-#endif /* __BLENDER_OBJECT_CULL_H__ */
+#endif  /* __BLENDER_OBJECT_CULL_H__ */
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -839,18 +839,18 @@ void *CCL_python_module_init()
 #ifdef WITH_NETWORK
 	PyModule_AddObject(mod, "with_network", Py_True);
 	Py_INCREF(Py_True);
-#else /* WITH_NETWORK */
+#else  /* WITH_NETWORK */
 	PyModule_AddObject(mod, "with_network", Py_False);
 	Py_INCREF(Py_False);
-#endif /* WITH_NETWORK */
+#endif  /* WITH_NETWORK */

 #ifdef WITH_EMBREE
 	PyModule_AddObject(mod, "with_embree", Py_True);
 	Py_INCREF(Py_True);
-#else /* WITH_EMBREE */
+#else  /* WITH_EMBREE */
 	PyModule_AddObject(mod, "with_embree", Py_False);
 	Py_INCREF(Py_False);
-#endif /* WITH_EMBREE */
+#endif  /* WITH_EMBREE */

 	return (void*)mod;
 }
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/blender_session.h
@@ -176,4 +176,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __BLENDER_SESSION_H__ */
+#endif  /* __BLENDER_SESSION_H__ */
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -213,4 +213,4 @@ private:

 CCL_NAMESPACE_END

-#endif /* __BLENDER_SYNC_H__ */
+#endif  /* __BLENDER_SYNC_H__ */
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -838,4 +838,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __BLENDER_UTIL_H__ */
+#endif  /* __BLENDER_UTIL_H__ */
--- a/intern/cycles/bvh/bvh.h
+++ b/intern/cycles/bvh/bvh.h
@@ -126,4 +126,4 @@ struct BVHStackEntry

 CCL_NAMESPACE_END

-#endif /* __BVH_H__ */
+#endif  /* __BVH_H__ */
--- a/intern/cycles/bvh/bvh2.h
+++ b/intern/cycles/bvh/bvh2.h
@@ -84,4 +84,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __BVH2_H__ */
+#endif  /* __BVH2_H__ */
--- a/intern/cycles/bvh/bvh4.h
+++ b/intern/cycles/bvh/bvh4.h
@@ -84,4 +84,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __BVH4_H__ */
+#endif  /* __BVH4_H__ */
--- a/intern/cycles/bvh/bvh8.h
+++ b/intern/cycles/bvh/bvh8.h
@@ -95,4 +95,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __BVH8_H__ */
+#endif  /* __BVH8_H__ */
--- a/intern/cycles/bvh/bvh_build.h
+++ b/intern/cycles/bvh/bvh_build.h
@@ -142,4 +142,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __BVH_BUILD_H__ */
+#endif  /* __BVH_BUILD_H__ */
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/bvh_embree.cpp
@@ -881,4 +881,4 @@ void BVHEmbree::refit_nodes()
 }
 CCL_NAMESPACE_END

-#endif /* WITH_EMBREE */
+#endif  /* WITH_EMBREE */
--- a/intern/cycles/bvh/bvh_embree.h
+++ b/intern/cycles/bvh/bvh_embree.h
@@ -74,6 +74,6 @@ private:

 CCL_NAMESPACE_END

-#endif /* WITH_EMBREE */
+#endif  /* WITH_EMBREE */

-#endif /* __BVH_EMBREE_H__ */
+#endif  /* __BVH_EMBREE_H__ */
--- a/intern/cycles/bvh/bvh_node.h
+++ b/intern/cycles/bvh/bvh_node.h
@@ -169,4 +169,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __BVH_NODE_H__ */
+#endif  /* __BVH_NODE_H__ */
--- a/intern/cycles/bvh/bvh_params.h
+++ b/intern/cycles/bvh/bvh_params.h
@@ -286,4 +286,4 @@ struct BVHSpatialStorage {

 CCL_NAMESPACE_END

-#endif /* __BVH_PARAMS_H__ */
+#endif  /* __BVH_PARAMS_H__ */
--- a/intern/cycles/bvh/bvh_sort.h
+++ b/intern/cycles/bvh/bvh_sort.h
@@ -35,4 +35,4 @@ void bvh_reference_sort(int start,

 CCL_NAMESPACE_END

-#endif /* __BVH_SORT_H__ */
+#endif  /* __BVH_SORT_H__ */
--- a/intern/cycles/bvh/bvh_split.h
+++ b/intern/cycles/bvh/bvh_split.h
@@ -259,4 +259,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __BVH_SPLIT_H__ */
+#endif  /* __BVH_SPLIT_H__ */
--- a/intern/cycles/bvh/bvh_unaligned.h
+++ b/intern/cycles/bvh/bvh_unaligned.h
@@ -77,4 +77,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __BVH_UNALIGNED_H__ */
+#endif  /* __BVH_UNALIGNED_H__ */
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -360,4 +360,4 @@ private:

 CCL_NAMESPACE_END

-#endif /* __DEVICE_H__ */
+#endif  /* __DEVICE_H__ */
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -288,7 +288,7 @@ public:
 		}
 #ifdef WITH_EMBREE
 		bvh_layout_mask |= BVH_LAYOUT_EMBREE;
-#endif /* WITH_EMBREE */
+#endif  /* WITH_EMBREE */
 		return bvh_layout_mask;
 	}

--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -2393,7 +2393,7 @@ bool device_cuda_init(void)
 	return result;
 #else  /* WITH_CUDA_DYNLOAD */
 	return true;
-#endif /* WITH_CUDA_DYNLOAD */
+#endif  /* WITH_CUDA_DYNLOAD */
 }

 Device *device_cuda_create(DeviceInfo& info, Stats &stats, bool background)
--- a/intern/cycles/device/device_denoising.h
+++ b/intern/cycles/device/device_denoising.h
@@ -166,4 +166,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __DEVICE_DENOISING_H__ */
+#endif  /* __DEVICE_DENOISING_H__ */
--- a/intern/cycles/device/device_intern.h
+++ b/intern/cycles/device/device_intern.h
@@ -40,4 +40,4 @@ string device_cuda_capabilities(void);

 CCL_NAMESPACE_END

-#endif /* __DEVICE_INTERN_H__ */
+#endif  /* __DEVICE_INTERN_H__ */
--- a/intern/cycles/device/device_memory.h
+++ b/intern/cycles/device/device_memory.h
@@ -496,4 +496,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __DEVICE_MEMORY_H__ */
+#endif  /* __DEVICE_MEMORY_H__ */
--- a/intern/cycles/device/device_network.h
+++ b/intern/cycles/device/device_network.h
@@ -488,4 +488,4 @@ CCL_NAMESPACE_END

 #endif

-#endif /* __DEVICE_NETWORK_H__ */
+#endif  /* __DEVICE_NETWORK_H__ */
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -245,4 +245,4 @@ string device_opencl_capabilities(void)

 CCL_NAMESPACE_END

-#endif /* WITH_OPENCL */
+#endif  /* WITH_OPENCL */
--- a/intern/cycles/device/device_split_kernel.h
+++ b/intern/cycles/device/device_split_kernel.h
@@ -130,4 +130,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __DEVICE_SPLIT_KERNEL_H__ */
+#endif  /* __DEVICE_SPLIT_KERNEL_H__ */
--- a/intern/cycles/device/device_task.h
+++ b/intern/cycles/device/device_task.h
@@ -85,4 +85,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __DEVICE_TASK_H__ */
+#endif  /* __DEVICE_TASK_H__ */
--- a/intern/cycles/device/opencl/opencl_split.cpp
+++ b/intern/cycles/device/opencl/opencl_split.cpp
@@ -463,4 +463,4 @@ Device *opencl_create_split_device(DeviceInfo& info, Stats& stats, bool backgrou

 CCL_NAMESPACE_END

-#endif /* WITH_OPENCL */
+#endif  /* WITH_OPENCL */
--- a/intern/cycles/kernel/bvh/bvh.h
+++ b/intern/cycles/kernel/bvh/bvh.h
@@ -203,40 +203,40 @@ ccl_device_intersect bool scene_intersect(KernelGlobals *kg,
 		}
 		return false;
 	}
-#endif /* __EMBREE__ */
+#endif  /* __EMBREE__ */
 #ifdef __OBJECT_MOTION__
 	if(kernel_data.bvh.have_motion) {
 #  ifdef __HAIR__
 		if(kernel_data.bvh.have_curves)
 			return bvh_intersect_hair_motion(kg, &ray, isect, visibility, lcg_state, difl, extmax);
-#  endif /* __HAIR__ */
+#  endif  /* __HAIR__ */

 		return bvh_intersect_motion(kg, &ray, isect, visibility);
 	}
-#endif /* __OBJECT_MOTION__ */
+#endif  /* __OBJECT_MOTION__ */

 #ifdef __HAIR__
 	if(kernel_data.bvh.have_curves)
 		return bvh_intersect_hair(kg, &ray, isect, visibility, lcg_state, difl, extmax);
-#endif /* __HAIR__ */
+#endif  /* __HAIR__ */

 #ifdef __KERNEL_CPU__

 #  ifdef __INSTANCING__
 	if(kernel_data.bvh.have_instancing)
 		return bvh_intersect_instancing(kg, &ray, isect, visibility);
-#  endif /* __INSTANCING__ */
+#  endif  /* __INSTANCING__ */

 	return bvh_intersect(kg, &ray, isect, visibility);
-#else /* __KERNEL_CPU__ */
+#else  /* __KERNEL_CPU__ */

 #  ifdef __INSTANCING__
 	return bvh_intersect_instancing(kg, &ray, isect, visibility);
 #  else
 	return bvh_intersect(kg, &ray, isect, visibility);
-#  endif /* __INSTANCING__ */
+#  endif  /* __INSTANCING__ */

-#endif /* __KERNEL_CPU__ */
+#endif  /* __KERNEL_CPU__ */
 }

 #ifdef __BVH_LOCAL__
@@ -298,7 +298,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg,

 		return local_isect->num_hits > 0;
 	}
-#endif /* __EMBREE__ */
+#endif  /* __EMBREE__ */
 #ifdef __OBJECT_MOTION__
 	if(kernel_data.bvh.have_motion) {
 		return bvh_intersect_local_motion(kg,
@@ -308,7 +308,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg,
 		                                  lcg_state,
 		                                  max_hits);
 	}
-#endif /* __OBJECT_MOTION__ */
+#endif  /* __OBJECT_MOTION__ */
 	return bvh_intersect_local(kg,
 	                            &ray,
 	                            local_isect,
@@ -358,7 +358,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals *kg,
 			                                            max_hits,
 			                                            num_hits);
 		}
-#    endif /* __HAIR__ */
+#    endif  /* __HAIR__ */

 		return bvh_intersect_shadow_all_motion(kg,
 		                                       ray,
@@ -367,7 +367,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals *kg,
 		                                       max_hits,
 		                                       num_hits);
 	}
-#  endif /* __OBJECT_MOTION__ */
+#  endif  /* __OBJECT_MOTION__ */

 #  ifdef __HAIR__
 	if(kernel_data.bvh.have_curves) {
@@ -378,7 +378,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals *kg,
 		                                     max_hits,
 		                                     num_hits);
 	}
-#  endif /* __HAIR__ */
+#  endif  /* __HAIR__ */

 #  ifdef __INSTANCING__
 	if(kernel_data.bvh.have_instancing) {
@@ -389,7 +389,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals *kg,
 		                                           max_hits,
 		                                           num_hits);
 	}
-#  endif /* __INSTANCING__ */
+#  endif  /* __INSTANCING__ */

 	return bvh_intersect_shadow_all(kg,
 	                                ray,
@@ -413,20 +413,20 @@ ccl_device_intersect bool scene_intersect_volume(KernelGlobals *kg,
 	if(kernel_data.bvh.have_motion) {
 		return bvh_intersect_volume_motion(kg, ray, isect, visibility);
 	}
-#  endif /* __OBJECT_MOTION__ */
+#  endif  /* __OBJECT_MOTION__ */
 #  ifdef __KERNEL_CPU__
 #    ifdef __INSTANCING__
 	if(kernel_data.bvh.have_instancing)
 		return bvh_intersect_volume_instancing(kg, ray, isect, visibility);
-#    endif /* __INSTANCING__ */
+#    endif  /* __INSTANCING__ */
 	return bvh_intersect_volume(kg, ray, isect, visibility);
-#  else /* __KERNEL_CPU__ */
+#  else  /* __KERNEL_CPU__ */
 #    ifdef __INSTANCING__
 	return bvh_intersect_volume_instancing(kg, ray, isect, visibility);
 #    else
 	return bvh_intersect_volume(kg, ray, isect, visibility);
-#    endif /* __INSTANCING__ */
-#  endif /* __KERNEL_CPU__ */
+#    endif  /* __INSTANCING__ */
+#  endif  /* __KERNEL_CPU__ */
 }
 #endif  /* __VOLUME__ */

@@ -457,11 +457,11 @@ ccl_device_intersect uint scene_intersect_volume_all(KernelGlobals *kg,
 	if(kernel_data.bvh.have_motion) {
 		return bvh_intersect_volume_all_motion(kg, ray, isect, max_hits, visibility);
 	}
-#  endif /* __OBJECT_MOTION__ */
+#  endif  /* __OBJECT_MOTION__ */
 #  ifdef __INSTANCING__
 	if(kernel_data.bvh.have_instancing)
 		return bvh_intersect_volume_all_instancing(kg, ray, isect, max_hits, visibility);
-#  endif /* __INSTANCING__ */
+#  endif  /* __INSTANCING__ */
 	return bvh_intersect_volume_all(kg, ray, isect, max_hits, visibility);
 }
 #endif  /* __VOLUME_RECORD_ALL__ */
--- a/intern/cycles/kernel/bvh/bvh_local.h
+++ b/intern/cycles/kernel/bvh/bvh_local.h
@@ -136,7 +136,7 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 				                               node_addr,
 				                               PATH_RAY_ALL_VISIBILITY,
 				                               dist);
-#else // __KERNEL_SSE2__
+#else  // __KERNEL_SSE2__
 				traverse_mask = NODE_INTERSECT(kg,
 				                               P,
 				                               dir,
@@ -151,7 +151,7 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 				                               node_addr,
 				                               PATH_RAY_ALL_VISIBILITY,
 				                               dist);
-#endif // __KERNEL_SSE2__
+#endif  // __KERNEL_SSE2__

 				node_addr = __float_as_int(cnodes.z);
 				node_addr_child1 = __float_as_int(cnodes.w);
--- a/intern/cycles/kernel/bvh/bvh_shadow_all.h
+++ b/intern/cycles/kernel/bvh/bvh_shadow_all.h
@@ -124,7 +124,7 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 				                               node_addr,
 				                               visibility,
 				                               dist);
-#else // __KERNEL_SSE2__
+#else  // __KERNEL_SSE2__
 				traverse_mask = NODE_INTERSECT(kg,
 				                               P,
 				                               dir,
@@ -139,7 +139,7 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 				                               node_addr,
 				                               visibility,
 				                               dist);
-#endif // __KERNEL_SSE2__
+#endif  // __KERNEL_SSE2__

 				node_addr = __float_as_int(cnodes.z);
 				node_addr_child1 = __float_as_int(cnodes.w);
--- a/intern/cycles/kernel/bvh/bvh_traversal.h
+++ b/intern/cycles/kernel/bvh/bvh_traversal.h
@@ -146,7 +146,7 @@ ccl_device_noinline bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 					                               visibility,
 					                               dist);
 				}
-#else // __KERNEL_SSE2__
+#else  // __KERNEL_SSE2__
 #  if BVH_FEATURE(BVH_HAIR_MINIMUM_WIDTH)
 				if(difl != 0.0f) {
 					traverse_mask = NODE_INTERSECT_ROBUST(kg,
@@ -184,7 +184,7 @@ ccl_device_noinline bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 					                               visibility,
 					                               dist);
 				}
-#endif // __KERNEL_SSE2__
+#endif  // __KERNEL_SSE2__

 				node_addr = __float_as_int(cnodes.z);
 				node_addr_child1 = __float_as_int(cnodes.w);
--- a/intern/cycles/kernel/bvh/bvh_volume.h
+++ b/intern/cycles/kernel/bvh/bvh_volume.h
@@ -120,7 +120,7 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 				                               node_addr,
 				                               visibility,
 				                               dist);
-#else // __KERNEL_SSE2__
+#else  // __KERNEL_SSE2__
 				traverse_mask = NODE_INTERSECT(kg,
 				                               P,
 				                               dir,
@@ -135,7 +135,7 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 				                               node_addr,
 				                               visibility,
 				                               dist);
-#endif // __KERNEL_SSE2__
+#endif  // __KERNEL_SSE2__

 				node_addr = __float_as_int(cnodes.z);
 				node_addr_child1 = __float_as_int(cnodes.w);
--- a/intern/cycles/kernel/bvh/bvh_volume_all.h
+++ b/intern/cycles/kernel/bvh/bvh_volume_all.h
@@ -124,7 +124,7 @@ uint BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 				                               node_addr,
 				                               visibility,
 				                               dist);
-#else // __KERNEL_SSE2__
+#else  // __KERNEL_SSE2__
 				traverse_mask = NODE_INTERSECT(kg,
 				                               P,
 				                               dir,
@@ -139,7 +139,7 @@ uint BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 				                               node_addr,
 				                               visibility,
 				                               dist);
-#endif // __KERNEL_SSE2__
+#endif  // __KERNEL_SSE2__

 				node_addr = __float_as_int(cnodes.z);
 				node_addr_child1 = __float_as_int(cnodes.w);
--- a/intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h
+++ b/intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h
@@ -232,4 +232,4 @@ ccl_device int bsdf_ashikhmin_shirley_sample(const ShaderClosure *sc, float3 Ng,

 CCL_NAMESPACE_END

-#endif /* __BSDF_ASHIKHMIN_SHIRLEY_H__ */
+#endif  /* __BSDF_ASHIKHMIN_SHIRLEY_H__ */
--- a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
+++ b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
@@ -158,4 +158,4 @@ ccl_device int bsdf_ashikhmin_velvet_sample(const ShaderClosure *sc, float3 Ng,

 CCL_NAMESPACE_END

-#endif /* __BSDF_ASHIKHMIN_VELVET_H__ */
+#endif  /* __BSDF_ASHIKHMIN_VELVET_H__ */
--- a/intern/cycles/kernel/closure/bsdf_diffuse.h
+++ b/intern/cycles/kernel/closure/bsdf_diffuse.h
@@ -139,4 +139,4 @@ ccl_device int bsdf_translucent_sample(const ShaderClosure *sc, float3 Ng, float

 CCL_NAMESPACE_END

-#endif /* __BSDF_DIFFUSE_H__ */
+#endif  /* __BSDF_DIFFUSE_H__ */
--- a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
+++ b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
@@ -103,8 +103,8 @@ ccl_device int bsdf_diffuse_ramp_sample(const ShaderClosure *sc, float3 Ng, floa
 	return LABEL_REFLECT|LABEL_DIFFUSE;
 }

-#endif /* __OSL__ */
+#endif  /* __OSL__ */

 CCL_NAMESPACE_END

-#endif /* __BSDF_DIFFUSE_RAMP_H__ */
+#endif  /* __BSDF_DIFFUSE_RAMP_H__ */
--- a/intern/cycles/kernel/closure/bsdf_hair.h
+++ b/intern/cycles/kernel/closure/bsdf_hair.h
@@ -277,4 +277,4 @@ ccl_device int bsdf_hair_transmission_sample(const ShaderClosure *sc, float3 Ng,

 CCL_NAMESPACE_END

-#endif /* __BSDF_HAIR_H__ */
+#endif  /* __BSDF_HAIR_H__ */
--- a/intern/cycles/kernel/closure/bsdf_hair_principled.h
+++ b/intern/cycles/kernel/closure/bsdf_hair_principled.h
@@ -229,7 +229,7 @@ ccl_device int bsdf_principled_hair_setup(ShaderData *sd, PrincipledHairBSDF *bs
 	return SD_BSDF|SD_BSDF_HAS_EVAL|SD_BSDF_NEEDS_LCG;
 }

-#endif /* __HAIR__ */
+#endif  /* __HAIR__ */

 /* Given the Fresnel term and transmittance, generate the attenuation terms for each bounce. */
 ccl_device_inline void hair_attenuation(KernelGlobals *kg,
@@ -499,4 +499,4 @@ ccl_device void bsdf_principled_hair_blur(ShaderClosure *sc, float roughness)

 CCL_NAMESPACE_END

-#endif /* __BSDF_HAIR_PRINCIPLED_H__ */
+#endif  /* __BSDF_HAIR_PRINCIPLED_H__ */
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@ -1124,4 +1124,4 @@ ccl_device int bsdf_microfacet_beckmann_sample(KernelGlobals *kg, const ShaderCl

 CCL_NAMESPACE_END

-#endif /* __BSDF_MICROFACET_H__ */
+#endif  /* __BSDF_MICROFACET_H__ */
--- a/intern/cycles/kernel/closure/bsdf_microfacet_multi_impl.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet_multi_impl.h
@@ -76,7 +76,7 @@ ccl_device_forceinline float3 MF_FUNCTION_FULL_NAME(mf_eval)(
 		eval *= -lambda_r / (shadowing_lambda - lambda_r);
 	else
 		eval *= -lambda_r * beta(-lambda_r, shadowing_lambda+1.0f);
-#else /* MF_MULTI_GLOSSY */
+#else  /* MF_MULTI_GLOSSY */
 	const float G2 = 1.0f / (1.0f - (lambda_r + 1.0f) + shadowing_lambda);
 	float val = G2 * 0.25f / wi.z;
 	if(alpha.x == alpha.y)
@@ -129,7 +129,7 @@ ccl_device_forceinline float3 MF_FUNCTION_FULL_NAME(mf_eval)(
 				phase = mf_eval_phase_glass(wr, lambda_r,  wo,  wo_outside, alpha, eta);
 			else
 				phase = mf_eval_phase_glass(wr, lambda_r, -wo, !wo_outside, alpha, 1.0f/eta);
-#else /* MF_MULTI_GLOSSY */
+#else  /* MF_MULTI_GLOSSY */
 			phase = mf_eval_phase_glossy(wr, lambda_r, wo, alpha) * throughput;
 #endif
 			eval += throughput * phase * mf_G1(wo_outside? wo: -wo, mf_C1((outside == wo_outside)? hr: -hr), shadowing_lambda);
@@ -153,7 +153,7 @@ ccl_device_forceinline float3 MF_FUNCTION_FULL_NAME(mf_eval)(
 			else if(use_fresnel && order > 0) {
 				throughput *= interpolate_fresnel_color(wi_prev, wm, eta, F0, cspec0);
 			}
-#else /* MF_MULTI_GLOSSY */
+#else  /* MF_MULTI_GLOSSY */
 			if(use_fresnel && order > 0) {
 				throughput *= interpolate_fresnel_color(-wr, wm, eta, F0, cspec0);
 			}
@@ -248,7 +248,7 @@ ccl_device_forceinline float3 MF_FUNCTION_FULL_NAME(mf_sample)(
 					throughput *= t_color;
 			}
 		}
-#else /* MF_MULTI_GLOSSY */
+#else  /* MF_MULTI_GLOSSY */
 		if(use_fresnel) {
 			float3 t_color = interpolate_fresnel_color(-wr, wm, eta, F0, cspec0);

--- a/intern/cycles/kernel/closure/bsdf_oren_nayar.h
+++ b/intern/cycles/kernel/closure/bsdf_oren_nayar.h
@@ -108,4 +108,4 @@ ccl_device int bsdf_oren_nayar_sample(const ShaderClosure *sc, float3 Ng, float3

 CCL_NAMESPACE_END

-#endif /* __BSDF_OREN_NAYAR_H__ */
+#endif  /* __BSDF_OREN_NAYAR_H__ */
--- a/intern/cycles/kernel/closure/bsdf_phong_ramp.h
+++ b/intern/cycles/kernel/closure/bsdf_phong_ramp.h
@@ -135,8 +135,8 @@ ccl_device int bsdf_phong_ramp_sample(const ShaderClosure *sc, float3 Ng, float3
 	return LABEL_REFLECT|LABEL_GLOSSY;
 }

-#endif /* __OSL__ */
+#endif  /* __OSL__ */

 CCL_NAMESPACE_END

-#endif /* __BSDF_PHONG_RAMP_H__ */
+#endif  /* __BSDF_PHONG_RAMP_H__ */
--- a/intern/cycles/kernel/closure/bsdf_principled_diffuse.h
+++ b/intern/cycles/kernel/closure/bsdf_principled_diffuse.h
@@ -122,4 +122,4 @@ ccl_device int bsdf_principled_diffuse_sample(const ShaderClosure *sc,

 CCL_NAMESPACE_END

-#endif /* __BSDF_PRINCIPLED_DIFFUSE_H__ */
+#endif  /* __BSDF_PRINCIPLED_DIFFUSE_H__ */
--- a/intern/cycles/kernel/closure/bsdf_principled_sheen.h
+++ b/intern/cycles/kernel/closure/bsdf_principled_sheen.h
@@ -108,4 +108,4 @@ ccl_device int bsdf_principled_sheen_sample(const ShaderClosure *sc,

 CCL_NAMESPACE_END

-#endif /* __BSDF_PRINCIPLED_SHEEN_H__ */
+#endif  /* __BSDF_PRINCIPLED_SHEEN_H__ */
--- a/intern/cycles/kernel/closure/bsdf_reflection.h
+++ b/intern/cycles/kernel/closure/bsdf_reflection.h
@@ -77,4 +77,4 @@ ccl_device int bsdf_reflection_sample(const ShaderClosure *sc, float3 Ng, float3

 CCL_NAMESPACE_END

-#endif /* __BSDF_REFLECTION_H__ */
+#endif  /* __BSDF_REFLECTION_H__ */
--- a/intern/cycles/kernel/closure/bsdf_refraction.h
+++ b/intern/cycles/kernel/closure/bsdf_refraction.h
@@ -86,4 +86,4 @@ ccl_device int bsdf_refraction_sample(const ShaderClosure *sc, float3 Ng, float3

 CCL_NAMESPACE_END

-#endif /* __BSDF_REFRACTION_H__ */
+#endif  /* __BSDF_REFRACTION_H__ */
--- a/intern/cycles/kernel/closure/bsdf_toon.h
+++ b/intern/cycles/kernel/closure/bsdf_toon.h
@@ -215,4 +215,4 @@ ccl_device int bsdf_glossy_toon_sample(const ShaderClosure *sc, float3 Ng, float

 CCL_NAMESPACE_END

-#endif /* __BSDF_TOON_H__ */
+#endif  /* __BSDF_TOON_H__ */
--- a/intern/cycles/kernel/closure/bsdf_transparent.h
+++ b/intern/cycles/kernel/closure/bsdf_transparent.h
@@ -106,4 +106,4 @@ ccl_device int bsdf_transparent_sample(const ShaderClosure *sc, float3 Ng, float

 CCL_NAMESPACE_END

-#endif /* __BSDF_TRANSPARENT_H__ */
+#endif  /* __BSDF_TRANSPARENT_H__ */
--- a/intern/cycles/kernel/closure/bsdf_util.h
+++ b/intern/cycles/kernel/closure/bsdf_util.h
@@ -158,4 +158,4 @@ ccl_device_forceinline float3 interpolate_fresnel_color(float3 L, float3 H, floa

 CCL_NAMESPACE_END

-#endif /* __BSDF_UTIL_H__ */
+#endif  /* __BSDF_UTIL_H__ */
--- a/intern/cycles/kernel/closure/bssrdf.h
+++ b/intern/cycles/kernel/closure/bssrdf.h
@@ -499,4 +499,4 @@ ccl_device_forceinline float bssrdf_pdf(const ShaderClosure *sc, float r)

 CCL_NAMESPACE_END

-#endif /* __KERNEL_BSSRDF_H__ */
+#endif  /* __KERNEL_BSSRDF_H__ */
--- a/intern/cycles/kernel/filter/filter.h
+++ b/intern/cycles/kernel/filter/filter.h
@@ -49,4 +49,4 @@ CCL_NAMESPACE_BEGIN

 CCL_NAMESPACE_END

-#endif /* __FILTER_H__ */
+#endif  /* __FILTER_H__ */
--- a/intern/cycles/kernel/filter/filter_defines.h
+++ b/intern/cycles/kernel/filter/filter_defines.h
@@ -68,4 +68,4 @@ typedef struct TileInfo {
 #  define ccl_get_tile_buffer(id) (tile_info->buffers[id])
 #endif

-#endif /* __FILTER_DEFINES_H__*/
+#endif  /* __FILTER_DEFINES_H__*/
--- a/intern/cycles/kernel/geom/geom_curve_intersect.h
+++ b/intern/cycles/kernel/geom/geom_curve_intersect.h
@@ -379,7 +379,7 @@ ccl_device_forceinline bool cardinal_curve_intersect(
 					float inv_mw_extension = 1.0f/mw_extension;
 					if(d0 >= 0)
 						coverage = (min(d1 * inv_mw_extension, 1.0f) - min(d0 * inv_mw_extension, 1.0f)) * 0.5f;
-					else // inside
+					else  // inside
 						coverage = (min(d1 * inv_mw_extension, 1.0f) + min(-d0 * inv_mw_extension, 1.0f)) * 0.5f;
 				}

--- a/intern/cycles/kernel/geom/geom_subd_triangle.h
+++ b/intern/cycles/kernel/geom/geom_subd_triangle.h
@@ -146,7 +146,7 @@ ccl_device_noinline float subd_triangle_attribute_float(KernelGlobals *kg, const
 		return a;
 	}
 	else
-#endif /* __PATCH_EVAL__ */
+#endif  /* __PATCH_EVAL__ */
 	if(desc.element == ATTR_ELEMENT_FACE) {
 		if(dx) *dx = 0.0f;
 		if(dy) *dy = 0.0f;
@@ -271,7 +271,7 @@ ccl_device_noinline float3 subd_triangle_attribute_float3(KernelGlobals *kg, con
 		return a;
 	}
 	else
-#endif /* __PATCH_EVAL__ */
+#endif  /* __PATCH_EVAL__ */
 	if(desc.element == ATTR_ELEMENT_FACE) {
 		if(dx) *dx = make_float3(0.0f, 0.0f, 0.0f);
 		if(dy) *dy = make_float3(0.0f, 0.0f, 0.0f);
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -544,7 +544,7 @@ int triangle_intersect8(KernelGlobals *kg,
 	return result;
 }

-#endif /* __KERNEL_AVX2__ */
+#endif  /* __KERNEL_AVX2__ */

 /* Special ray intersection routines for subsurface scattering. In that case we
 * only want to intersect with primitives in the same object, and if case of
--- a/intern/cycles/kernel/kernel.h
+++ b/intern/cycles/kernel/kernel.h
@@ -63,4 +63,4 @@ void kernel_tex_copy(KernelGlobals *kg,

 CCL_NAMESPACE_END

-#endif /* __KERNEL_H__ */
+#endif  /* __KERNEL_H__ */
--- a/intern/cycles/kernel/kernel_color.h
+++ b/intern/cycles/kernel/kernel_color.h
@@ -35,4 +35,4 @@ ccl_device float linear_rgb_to_gray(KernelGlobals *kg, float3 c)

 CCL_NAMESPACE_END

-#endif /* __KERNEL_COLOR_H__ */
+#endif  /* __KERNEL_COLOR_H__ */
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -153,4 +153,4 @@ typedef vector3<avxf> avx3f;

 CCL_NAMESPACE_END

-#endif /* __KERNEL_COMPAT_CPU_H__ */
+#endif  /* __KERNEL_COMPAT_CPU_H__ */
--- a/intern/cycles/kernel/kernel_compat_cuda.h
+++ b/intern/cycles/kernel/kernel_compat_cuda.h
@@ -150,4 +150,4 @@ ccl_device_inline uint ccl_num_groups(uint d)
 #define logf(x) __logf(((float)(x)))
 #define expf(x) __expf(((float)(x)))

-#endif /* __KERNEL_COMPAT_CUDA_H__ */
+#endif  /* __KERNEL_COMPAT_CUDA_H__ */
--- a/intern/cycles/kernel/kernel_compat_opencl.h
+++ b/intern/cycles/kernel/kernel_compat_opencl.h
@@ -159,4 +159,4 @@
 #include "util/util_half.h"
 #include "util/util_types.h"

-#endif /* __KERNEL_COMPAT_OPENCL_H__ */
+#endif  /* __KERNEL_COMPAT_OPENCL_H__ */
--- a/intern/cycles/kernel/kernel_id_passes.h
+++ b/intern/cycles/kernel/kernel_id_passes.h
@@ -43,7 +43,7 @@ ccl_device_inline void kernel_write_id_slots(ccl_global float *buffer, int num_s
 			atomic_add_and_fetch_float(buffer+slot*2+1, weight);
 			break;
 		}
-#else /* __ATOMIC_PASS_WRITE__ */
+#else  /* __ATOMIC_PASS_WRITE__ */
 		/* If the loop reaches an empty slot, the ID isn't in any slot yet - so add it! */
 		if(id_buffer[slot].x == ID_NONE) {
 			id_buffer[slot].x = id;
@@ -56,7 +56,7 @@ ccl_device_inline void kernel_write_id_slots(ccl_global float *buffer, int num_s
 			id_buffer[slot].y += weight;
 			break;
 		}
-#endif /* __ATOMIC_PASS_WRITE__ */
+#endif  /* __ATOMIC_PASS_WRITE__ */
 	}
 }

--- a/intern/cycles/kernel/kernel_math.h
+++ b/intern/cycles/kernel/kernel_math.h
@@ -25,4 +25,4 @@
 #include "util/util_texture.h"
 #include "util/util_transform.h"

-#endif /* __KERNEL_MATH_H__ */
+#endif  /* __KERNEL_MATH_H__ */
--- a/intern/cycles/kernel/kernel_montecarlo.h
+++ b/intern/cycles/kernel/kernel_montecarlo.h
@@ -282,4 +282,4 @@ ccl_device float3 ensure_valid_reflection(float3 Ng, float3 I, float3 N)

 CCL_NAMESPACE_END

-#endif /* __KERNEL_MONTECARLO_CL__ */
+#endif  /* __KERNEL_MONTECARLO_CL__ */
--- a/intern/cycles/kernel/kernel_passes.h
+++ b/intern/cycles/kernel/kernel_passes.h
@@ -110,7 +110,7 @@ ccl_device_inline void kernel_write_denoising_shadow(KernelGlobals *kg, ccl_glob
 	float value = path_total_shaded / max(path_total, 1e-7f);
 	kernel_write_pass_float(buffer+2, value*value);
 }
-#endif /* __DENOISING_FEATURES__ */
+#endif  /* __DENOISING_FEATURES__ */

 ccl_device_inline void kernel_update_denoising_features(KernelGlobals *kg,
                                                        ShaderData *sd,
@@ -189,7 +189,7 @@ ccl_device_inline void kernel_write_debug_passes(KernelGlobals *kg,
 		                        L->debug_data.num_ray_bounces);
 	}
 }
-#endif /* __KERNEL_DEBUG__ */
+#endif  /* __KERNEL_DEBUG__ */

 #ifdef __KERNEL_CPU__
 #define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) kernel_write_id_pass_cpu(buffer, depth * 2, id, matte_weight, kg->coverage_##name)
@@ -199,11 +199,11 @@ ccl_device_inline size_t kernel_write_id_pass_cpu(float *buffer, size_t depth, f
 		(*map)[id] += matte_weight;
 		return 0;
 	}
-#else /* __KERNEL_CPU__ */
+#else  /* __KERNEL_CPU__ */
 #define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) kernel_write_id_slots_gpu(buffer, depth * 2, id, matte_weight) 
 ccl_device_inline size_t kernel_write_id_slots_gpu(ccl_global float *buffer, size_t depth, float id, float matte_weight)
 {
-#endif /* __KERNEL_CPU__ */
+#endif  /* __KERNEL_CPU__ */
 	kernel_write_id_slots(buffer, depth, id, matte_weight);
 	return depth * 2;
 }
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -266,7 +266,7 @@ ccl_device_forceinline VolumeIntegrateResult kernel_path_volume(
 }
 #endif  /* __VOLUME__ */

-#endif /* __SPLIT_KERNEL__ */
+#endif  /* __SPLIT_KERNEL__ */

 ccl_device_forceinline bool kernel_path_shader_apply(
 	KernelGlobals *kg,
@@ -434,7 +434,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg,
 		else if(result == VOLUME_PATH_MISSED) {
 			break;
 		}
-#endif /* __VOLUME__*/
+#endif  /* __VOLUME__*/

 		/* Shade background. */
 		if(!hit) {
@@ -557,7 +557,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg,
 #endif  /* __SUBSURFACE__ */
 }

-#endif /* defined(__BRANCHED_PATH__) || defined(__BAKING__) */
+#endif  /* defined(__BRANCHED_PATH__) || defined(__BAKING__) */

 ccl_device_forceinline void kernel_path_integrate(
 	KernelGlobals *kg,
@@ -605,7 +605,7 @@ ccl_device_forceinline void kernel_path_integrate(
 		else if(result == VOLUME_PATH_MISSED) {
 			break;
 		}
-#endif /* __VOLUME__*/
+#endif  /* __VOLUME__*/

 		/* Shade background. */
 		if(!hit) {
--- a/intern/cycles/kernel/kernel_path_volume.h
+++ b/intern/cycles/kernel/kernel_path_volume.h
@@ -55,7 +55,7 @@ ccl_device_inline void kernel_path_volume_connect_light(
 			}
 		}
 	}
-#endif /* __EMISSION__ */
+#endif  /* __EMISSION__ */
 }

 #ifdef __KERNEL_GPU__
@@ -277,10 +277,10 @@ ccl_device void kernel_branched_path_volume_connect_light(
 			}
 		}
 	}
-#endif /* __EMISSION__ */
+#endif  /* __EMISSION__ */
 }
-#endif /* __SPLIT_KERNEL__ */
+#endif  /* __SPLIT_KERNEL__ */

-#endif /* __VOLUME_SCATTER__ */
+#endif  /* __VOLUME_SCATTER__ */

 CCL_NAMESPACE_END
--- a/intern/cycles/kernel/kernel_queues.h
+++ b/intern/cycles/kernel/kernel_queues.h
@@ -145,4 +145,4 @@ ccl_device int dequeue_ray_index(

 CCL_NAMESPACE_END

-#endif // __KERNEL_QUEUE_H__
+#endif  // __KERNEL_QUEUE_H__
--- a/intern/cycles/kernel/kernel_random.h
+++ b/intern/cycles/kernel/kernel_random.h
@@ -50,7 +50,7 @@ ccl_device uint sobol_dimension(KernelGlobals *kg, int index, int dimension)
 	return result;
 }

-#endif /* __SOBOL__ */
+#endif  /* __SOBOL__ */


 ccl_device_forceinline float path_rng_1D(KernelGlobals *kg,
--- a/intern/cycles/kernel/kernel_shadow.h
+++ b/intern/cycles/kernel/kernel_shadow.h
@@ -446,7 +446,7 @@ ccl_device bool shadow_blocked_transparent_stepped(
 }

 #  endif  /* __KERNEL_GPU__ || !__SHADOW_RECORD_ALL__ */
-#endif /* __TRANSPARENT_SHADOWS__ */
+#endif  /* __TRANSPARENT_SHADOWS__ */

 ccl_device_inline bool shadow_blocked(KernelGlobals *kg,
                                      ShaderData *sd,
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -615,7 +615,7 @@ typedef ccl_addr_space struct PathRadiance {

 #ifdef __KERNEL_DEBUG__
 	DebugData debug_data;
-#endif /* __KERNEL_DEBUG__ */
+#endif  /* __KERNEL_DEBUG__ */
 } PathRadiance;

 typedef struct BsdfEval {
@@ -1705,4 +1705,4 @@ typedef struct WorkTile {

 CCL_NAMESPACE_END

-#endif /*  __KERNEL_TYPES_H__ */
+#endif  /*  __KERNEL_TYPES_H__ */
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -87,7 +87,7 @@ ccl_device_inline bool volume_shader_sample(KernelGlobals *kg,
 	return true;
 }

-#endif /* __VOLUME__ */
+#endif  /* __VOLUME__ */

 ccl_device float3 volume_color_transmittance(float3 sigma, float t)
 {
@@ -270,7 +270,7 @@ ccl_device_noinline void kernel_volume_shadow(KernelGlobals *kg,
 		kernel_volume_shadow_homogeneous(kg, state, ray, shadow_sd, throughput);
 }

-#endif /* __VOLUME__ */
+#endif  /* __VOLUME__ */

 /* Equi-angular sampling as in:
 * "Importance Sampling Techniques for Path Tracing in Participating Media" */
@@ -1075,7 +1075,7 @@ ccl_device VolumeIntegrateResult kernel_volume_decoupled_scatter(

 	return VOLUME_PATH_SCATTERED;
 }
-#endif /* __SPLIT_KERNEL */
+#endif  /* __SPLIT_KERNEL */

 /* decide if we need to use decoupled or not */
 ccl_device bool kernel_volume_use_decoupled(KernelGlobals *kg, bool heterogeneous, bool direct, int sampling_method)
@@ -1377,6 +1377,6 @@ ccl_device_inline void kernel_volume_clean_stack(KernelGlobals *kg,
 	}
 }

-#endif /* __VOLUME__ */
+#endif  /* __VOLUME__ */

 CCL_NAMESPACE_END
--- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
+++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
@@ -540,4 +540,4 @@ ccl_device float4 kernel_tex_image_interp_3d(KernelGlobals *kg, int id, float x,

 CCL_NAMESPACE_END

-#endif // __KERNEL_CPU_IMAGE_H__
+#endif  // __KERNEL_CPU_IMAGE_H__
--- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
+++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
@@ -97,7 +97,7 @@ void KERNEL_FUNCTION_FULL_NAME(path_trace)(KernelGlobals *kg,
 	{
 		kernel_path_trace(kg, buffer, sample, x, y, offset, stride);
 	}
-#endif /* KERNEL_STUB */
+#endif  /* KERNEL_STUB */
 }

 /* Film */
@@ -120,7 +120,7 @@ void KERNEL_FUNCTION_FULL_NAME(convert_to_byte)(KernelGlobals *kg,
 	                            x, y,
 	                            offset,
 	                            stride);
-#endif /* KERNEL_STUB */
+#endif  /* KERNEL_STUB */
 }

 void KERNEL_FUNCTION_FULL_NAME(convert_to_half_float)(KernelGlobals *kg,
@@ -141,7 +141,7 @@ void KERNEL_FUNCTION_FULL_NAME(convert_to_half_float)(KernelGlobals *kg,
 	                                  x, y,
 	                                  offset,
 	                                  stride);
-#endif /* KERNEL_STUB */
+#endif  /* KERNEL_STUB */
 }

 /* Shader Evaluate */
@@ -176,7 +176,7 @@ void KERNEL_FUNCTION_FULL_NAME(shader)(KernelGlobals *kg,
 	else {
 		kernel_background_evaluate(kg, input, output, i);
 	}
-#endif /* KERNEL_STUB */
+#endif  /* KERNEL_STUB */
 }

 #else  /* __SPLIT_KERNEL__ */
@@ -208,7 +208,7 @@ void KERNEL_FUNCTION_FULL_NAME(shader)(KernelGlobals *kg,
 		ccl_local type locals; \
 		kernel_##name(kg, &locals); \
 	}
-#endif /* KERNEL_STUB */
+#endif  /* KERNEL_STUB */

 DEFINE_SPLIT_KERNEL_FUNCTION(path_init)
 DEFINE_SPLIT_KERNEL_FUNCTION(scene_intersect)
--- a/intern/cycles/kernel/osl/osl_closures.h
+++ b/intern/cycles/kernel/osl/osl_closures.h
@@ -146,4 +146,4 @@ CCLOSURE_PREPARE_STATIC(bsdf_##lower##_prepare, Upper##Closure)

 CCL_NAMESPACE_END

-#endif /* __OSL_CLOSURES_H__ */
+#endif  /* __OSL_CLOSURES_H__ */
--- a/intern/cycles/kernel/osl/osl_globals.h
+++ b/intern/cycles/kernel/osl/osl_globals.h
@@ -94,4 +94,4 @@ CCL_NAMESPACE_END

 #endif

-#endif /* __OSL_GLOBALS_H__ */
+#endif  /* __OSL_GLOBALS_H__ */
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/osl_services.h
@@ -199,4 +199,4 @@ private:

 CCL_NAMESPACE_END

-#endif /* __OSL_SERVICES_H__  */
+#endif  /* __OSL_SERVICES_H__  */
--- a/intern/cycles/kernel/osl/osl_shader.h
+++ b/intern/cycles/kernel/osl/osl_shader.h
@@ -66,4 +66,4 @@ CCL_NAMESPACE_END

 #endif

-#endif /* __OSL_SHADER_H__ */
+#endif  /* __OSL_SHADER_H__ */
--- a/intern/cycles/kernel/shaders/oslutil.h
+++ b/intern/cycles/kernel/shaders/oslutil.h
@@ -92,4 +92,4 @@ float wireframe(string edge_type, float line_width) { return wireframe(edge_type
 float wireframe(string edge_type) { return wireframe(edge_type, 1.0, 1); }
 float wireframe() { return wireframe("polygons", 1.0, 1); }

-#endif /* CCL_OSLUTIL_H */
+#endif  /* CCL_OSLUTIL_H */
--- a/intern/cycles/kernel/shaders/stdosl.h
+++ b/intern/cycles/kernel/shaders/stdosl.h
@@ -515,7 +515,7 @@ float smooth_linearstep (float edge0, float edge1, float x_, float eps_) {
        else if (x >= eps && x <= 1.0-eps) result = x;
        else if (x >= 1.0+eps)             result = 1;
        else if (x < eps)                  result = rampup (x+eps, 2.0*eps);
-        else /* if (x < 1.0+eps) */        result = 1.0 - rampup (1.0+eps - x, 2.0*eps);
+        else  /* if (x < 1.0+eps) */        result = 1.0 - rampup (1.0+eps - x, 2.0*eps);
    } else {
        result = step (edge0, x_);
    }
@@ -686,4 +686,4 @@ int getmatrix (string fromspace, output matrix M) {
 #undef PERCOMP2
 #undef PERCOMP2F

-#endif /* CCL_STDOSL_H */
+#endif  /* CCL_STDOSL_H */
--- a/intern/cycles/kernel/split/kernel_shader_sort.h
+++ b/intern/cycles/kernel/split/kernel_shader_sort.h
@@ -78,7 +78,7 @@ ccl_device void kernel_shader_sort(KernelGlobals *kg,
 			}
 		}
 	}
-#  endif /* __KERNEL_OPENCL__ */
+#  endif  /* __KERNEL_OPENCL__ */

 	/* copy to destination */
 	for(uint i = 0; i < SHADER_SORT_BLOCK_SIZE; i += SHADER_SORT_LOCAL_SIZE) {
@@ -91,7 +91,7 @@ ccl_device void kernel_shader_sort(KernelGlobals *kg,
 			kernel_split_state.queue_data[outi] = (value == (~0)) ? QUEUE_EMPTY_SLOT : kernel_split_state.queue_data[ini];
 		}
 	}
-#endif /* __KERNEL_CUDA__ */
+#endif  /* __KERNEL_CUDA__ */
 }

 CCL_NAMESPACE_END
--- a/intern/cycles/kernel/split/kernel_split_data_types.h
+++ b/intern/cycles/kernel/split/kernel_split_data_types.h
@@ -86,14 +86,14 @@ typedef ccl_global struct SplitBranchedState {
 	SPLIT_DATA_ENTRY(ccl_global SubsurfaceIndirectRays, ss_rays, 1)
 #else
 #  define SPLIT_DATA_SUBSURFACE_ENTRIES
-#endif /* __SUBSURFACE__ */
+#endif  /* __SUBSURFACE__ */

 #ifdef __VOLUME__
 #  define SPLIT_DATA_VOLUME_ENTRIES \
 	SPLIT_DATA_ENTRY(ccl_global PathState, state_shadow, 1)
 #else
 #  define SPLIT_DATA_VOLUME_ENTRIES
-#endif /* __VOLUME__ */
+#endif  /* __VOLUME__ */

 #define SPLIT_DATA_ENTRIES \
 	SPLIT_DATA_ENTRY(ccl_global float3, throughput, 1) \
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -313,7 +313,7 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ccl_a
 			case NODE_LEAVE_BUMP_EVAL:
 				svm_node_leave_bump_eval(kg, sd, stack, node.y);
 				break;
-#      endif /* NODES_FEATURE(NODE_FEATURE_BUMP_STATE) */
+#      endif  /* NODES_FEATURE(NODE_FEATURE_BUMP_STATE) */
 #    endif  /* NODES_FEATURE(NODE_FEATURE_BUMP) */
 			case NODE_HSV:
 				svm_node_hsv(kg, sd, stack, node, &offset);
@@ -497,4 +497,4 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ccl_a

 CCL_NAMESPACE_END

-#endif /* __SVM_H__ */
+#endif  /* __SVM_H__ */
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -285,7 +285,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 						/* setup bsdf */
 						if(distribution == CLOSURE_BSDF_MICROFACET_GGX_GLASS_ID || roughness <= 0.075f) /* use single-scatter GGX */
 							sd->flag |= bsdf_microfacet_ggx_aniso_fresnel_setup(bsdf, sd);
-						else /* use multi-scatter GGX */
+						else  /* use multi-scatter GGX */
 							sd->flag |= bsdf_microfacet_multi_ggx_aniso_fresnel_setup(bsdf, sd);
 					}
 				}
--- a/intern/cycles/kernel/svm/svm_hsv.h
+++ b/intern/cycles/kernel/svm/svm_hsv.h
@@ -59,4 +59,4 @@ ccl_device void svm_node_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, ui

 CCL_NAMESPACE_END

-#endif /* __SVM_HSV_H__ */
+#endif  /* __SVM_HSV_H__ */
--- a/intern/cycles/kernel/svm/svm_ramp.h
+++ b/intern/cycles/kernel/svm/svm_ramp.h
@@ -108,4 +108,4 @@ ccl_device void svm_node_curves(KernelGlobals *kg, ShaderData *sd, float *stack,

 CCL_NAMESPACE_END

-#endif /* __SVM_RAMP_H__ */
+#endif  /* __SVM_RAMP_H__ */
--- a/intern/cycles/kernel/svm/svm_ramp_util.h
+++ b/intern/cycles/kernel/svm/svm_ramp_util.h
@@ -95,4 +95,4 @@ ccl_device float float_ramp_lookup(const float *ramp,

 CCL_NAMESPACE_END

-#endif /* __SVM_RAMP_UTIL_H__ */
+#endif  /* __SVM_RAMP_UTIL_H__ */
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -531,4 +531,4 @@ typedef enum ClosureType {

 CCL_NAMESPACE_END

-#endif /*  __SVM_TYPES_H__ */
+#endif  /*  __SVM_TYPES_H__ */
--- a/intern/cycles/kernel/svm/svm_wave.h
+++ b/intern/cycles/kernel/svm/svm_wave.h
@@ -24,7 +24,7 @@ ccl_device_noinline float svm_wave(NodeWaveType type, NodeWaveProfile profile, f

 	if(type == NODE_WAVE_BANDS)
 		n = (p.x + p.y + p.z) * 10.0f;
-	else /* NODE_WAVE_RINGS */
+	else  /* NODE_WAVE_RINGS */
 		n = len(p) * 20.0f;

 	if(distortion != 0.0f)
--- a/intern/cycles/render/attribute.h
+++ b/intern/cycles/render/attribute.h
@@ -172,4 +172,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __ATTRIBUTE_H__ */
+#endif  /* __ATTRIBUTE_H__ */
--- a/intern/cycles/render/background.h
+++ b/intern/cycles/render/background.h
@@ -59,4 +59,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __BACKGROUND_H__ */
+#endif  /* __BACKGROUND_H__ */
--- a/intern/cycles/render/bake.h
+++ b/intern/cycles/render/bake.h
@@ -83,4 +83,4 @@ private:

 CCL_NAMESPACE_END

-#endif /* __BAKE_H__ */
+#endif  /* __BAKE_H__ */
--- a/intern/cycles/render/buffers.h
+++ b/intern/cycles/render/buffers.h
@@ -146,4 +146,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __BUFFERS_H__ */
+#endif  /* __BUFFERS_H__ */
--- a/intern/cycles/render/camera.h
+++ b/intern/cycles/render/camera.h
@@ -212,4 +212,4 @@ private:

 CCL_NAMESPACE_END

-#endif /* __CAMERA_H__ */
+#endif  /* __CAMERA_H__ */
--- a/intern/cycles/render/constant_fold.h
+++ b/intern/cycles/render/constant_fold.h
@@ -70,4 +70,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __CONSTANT_FOLD_H__ */
+#endif  /* __CONSTANT_FOLD_H__ */
--- a/intern/cycles/render/coverage.h
+++ b/intern/cycles/render/coverage.h
@@ -46,4 +46,4 @@ private:

 CCL_NAMESPACE_END

-#endif /* __COVERAGE_H__ */
+#endif  /* __COVERAGE_H__ */
--- a/intern/cycles/render/curves.h
+++ b/intern/cycles/render/curves.h
@@ -119,4 +119,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __CURVES_H__ */
+#endif  /* __CURVES_H__ */
--- a/intern/cycles/render/film.h
+++ b/intern/cycles/render/film.h
@@ -95,4 +95,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __FILM_H__ */
+#endif  /* __FILM_H__ */
--- a/intern/cycles/render/graph.h
+++ b/intern/cycles/render/graph.h
@@ -293,4 +293,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __GRAPH_H__ */
+#endif  /* __GRAPH_H__ */
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -164,4 +164,4 @@ private:

 CCL_NAMESPACE_END

-#endif /* __IMAGE_H__ */
+#endif  /* __IMAGE_H__ */
--- a/intern/cycles/render/integrator.h
+++ b/intern/cycles/render/integrator.h
@@ -94,4 +94,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __INTEGRATOR_H__ */
+#endif  /* __INTEGRATOR_H__ */
--- a/intern/cycles/render/light.h
+++ b/intern/cycles/render/light.h
@@ -139,4 +139,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __LIGHT_H__ */
+#endif  /* __LIGHT_H__ */
--- a/intern/cycles/render/mesh.h
+++ b/intern/cycles/render/mesh.h
@@ -390,4 +390,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __MESH_H__ */
+#endif  /* __MESH_H__ */
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -1161,4 +1161,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __NODES_H__ */
+#endif  /* __NODES_H__ */
--- a/intern/cycles/render/object.h
+++ b/intern/cycles/render/object.h
@@ -132,4 +132,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __OBJECT_H__ */
+#endif  /* __OBJECT_H__ */
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -1255,6 +1255,6 @@ void OSLCompiler::parameter_color_array(const char * /*name*/, const array<float
 {
 }

-#endif /* WITH_OSL */
+#endif  /* WITH_OSL */

 CCL_NAMESPACE_END
--- a/intern/cycles/render/osl.h
+++ b/intern/cycles/render/osl.h
@@ -171,4 +171,4 @@ private:

 CCL_NAMESPACE_END

-#endif /* __OSL_H__  */
+#endif  /* __OSL_H__  */
--- a/intern/cycles/render/particles.h
+++ b/intern/cycles/render/particles.h
@@ -68,4 +68,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __PARTICLES_H__ */
+#endif  /* __PARTICLES_H__ */
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -268,4 +268,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /*  __SCENE_H__ */
+#endif  /*  __SCENE_H__ */
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -238,4 +238,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __SESSION_H__ */
+#endif  /* __SESSION_H__ */
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -224,4 +224,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __SHADER_H__ */
+#endif  /* __SHADER_H__ */
--- a/intern/cycles/render/sobol.h
+++ b/intern/cycles/render/sobol.h
@@ -28,4 +28,4 @@ void sobol_generate_direction_vectors(uint vectors[][SOBOL_BITS], int dimensions

 CCL_NAMESPACE_END

-#endif /* __SOBOL_H__ */
+#endif  /* __SOBOL_H__ */
--- a/intern/cycles/render/stats.h
+++ b/intern/cycles/render/stats.h
@@ -101,4 +101,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __RENDER_STATS_H__ */
+#endif  /* __RENDER_STATS_H__ */
--- a/intern/cycles/render/svm.cpp
+++ b/intern/cycles/render/svm.cpp
@@ -266,7 +266,7 @@ int SVMCompiler::stack_assign(ShaderInput *input)
 				add_node(NODE_VALUE_V, input->stack_offset);
 				add_node(NODE_VALUE_V, node->get_float3(input->socket_type));
 			}
-			else /* should not get called for closure */
+			else  /* should not get called for closure */
 				assert(0);
 		}
 	}
--- a/intern/cycles/render/svm.h
+++ b/intern/cycles/render/svm.h
@@ -223,4 +223,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __SVM_H__ */
+#endif  /* __SVM_H__ */
--- a/intern/cycles/render/tables.h
+++ b/intern/cycles/render/tables.h
@@ -50,4 +50,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __TABLES_H__ */
+#endif  /* __TABLES_H__ */
--- a/intern/cycles/render/tile.h
+++ b/intern/cycles/render/tile.h
@@ -154,4 +154,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __TILE_H__ */
+#endif  /* __TILE_H__ */
--- a/intern/cycles/subd/subd_dice.h
+++ b/intern/cycles/subd/subd_dice.h
@@ -134,4 +134,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __SUBD_DICE_H__ */
+#endif  /* __SUBD_DICE_H__ */
--- a/intern/cycles/subd/subd_patch.h
+++ b/intern/cycles/subd/subd_patch.h
@@ -56,4 +56,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __SUBD_PATCH_H__ */
+#endif  /* __SUBD_PATCH_H__ */
--- a/intern/cycles/subd/subd_patch_table.h
+++ b/intern/cycles/subd/subd_patch_table.h
@@ -59,4 +59,4 @@ struct PackedPatchTable {

 CCL_NAMESPACE_END

-#endif /* __SUBD_PATCH_TABLE_H__ */
+#endif  /* __SUBD_PATCH_TABLE_H__ */
--- a/intern/cycles/subd/subd_split.h
+++ b/intern/cycles/subd/subd_split.h
@@ -56,4 +56,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __SUBD_SPLIT_H__ */
+#endif  /* __SUBD_SPLIT_H__ */
--- a/intern/cycles/test/util_path_test.cpp
+++ b/intern/cycles/test/util_path_test.cpp
@@ -370,7 +370,7 @@ TEST(util_path_is_relative, relative_windir_on_unix)
 	bool is_relative = path_is_relative("tmp\\foo.txt");
 	EXPECT_TRUE(is_relative);
 }
-#endif /* !_WIN32 */
+#endif  /* !_WIN32 */

 #ifdef _WIN32
 TEST(util_path_is_relative, absolute_windows)
@@ -396,6 +396,6 @@ TEST(util_path_is_relative, relative_unixdir_on_windows)
 	bool is_relative = path_is_relative("tmp/foo.txt");
 	EXPECT_TRUE(is_relative);
 }
-#endif /* _WIN32 */
+#endif  /* _WIN32 */

 CCL_NAMESPACE_END
--- a/intern/cycles/util/util_algorithm.h
+++ b/intern/cycles/util/util_algorithm.h
@@ -29,4 +29,4 @@ using std::remove;

 CCL_NAMESPACE_END

-#endif /* __UTIL_ALGORITHM_H__ */
+#endif  /* __UTIL_ALGORITHM_H__ */
--- a/intern/cycles/util/util_args.h
+++ b/intern/cycles/util/util_args.h
@@ -28,4 +28,4 @@ OIIO_NAMESPACE_USING

 CCL_NAMESPACE_END

-#endif /* __UTIL_ARGS_H__ */
+#endif  /* __UTIL_ARGS_H__ */
--- a/intern/cycles/util/util_atomic.h
+++ b/intern/cycles/util/util_atomic.h
@@ -110,4 +110,4 @@ ccl_device_inline float atomic_compare_and_swap_float(volatile float *dest,

 #endif  /* __KERNEL_GPU__ */

-#endif /* __UTIL_ATOMIC_H__ */
+#endif  /* __UTIL_ATOMIC_H__ */
--- a/intern/cycles/util/util_boundbox.h
+++ b/intern/cycles/util/util_boundbox.h
@@ -282,4 +282,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __UTIL_BOUNDBOX_H__ */
+#endif  /* __UTIL_BOUNDBOX_H__ */
--- a/intern/cycles/util/util_color.h
+++ b/intern/cycles/util/util_color.h
@@ -240,4 +240,4 @@ ccl_device float4 color_srgb_to_linear_v4(float4 c)

 CCL_NAMESPACE_END

-#endif /* __UTIL_COLOR_H__ */
+#endif  /* __UTIL_COLOR_H__ */
--- a/intern/cycles/util/util_debug.h
+++ b/intern/cycles/util/util_debug.h
@@ -182,4 +182,4 @@ std::ostream& operator <<(std::ostream &os,

 CCL_NAMESPACE_END

-#endif /* __UTIL_DEBUG_H__ */
+#endif  /* __UTIL_DEBUG_H__ */
--- a/intern/cycles/util/util_defines.h
+++ b/intern/cycles/util/util_defines.h
@@ -128,4 +128,4 @@ template<typename T> static inline T decltype_helper(T x) { return x; }
 #  define util_assert(statement)
 #endif

-#endif /* __UTIL_DEFINES_H__ */
+#endif  /* __UTIL_DEFINES_H__ */
--- a/intern/cycles/util/util_foreach.h
+++ b/intern/cycles/util/util_foreach.h
@@ -21,4 +21,4 @@

 #define foreach(x, y) for(x : y)

-#endif /* __UTIL_FOREACH_H__ */
+#endif  /* __UTIL_FOREACH_H__ */
--- a/intern/cycles/util/util_function.h
+++ b/intern/cycles/util/util_function.h
@@ -36,4 +36,4 @@ using std::placeholders::_9;

 CCL_NAMESPACE_END

-#endif /* __UTIL_FUNCTION_H__ */
+#endif  /* __UTIL_FUNCTION_H__ */
--- a/intern/cycles/util/util_half.h
+++ b/intern/cycles/util/util_half.h
@@ -148,4 +148,4 @@ ccl_device_inline half float_to_half(float f)

 CCL_NAMESPACE_END

-#endif /* __UTIL_HALF_H__ */
+#endif  /* __UTIL_HALF_H__ */
--- a/intern/cycles/util/util_hash.h
+++ b/intern/cycles/util/util_hash.h
@@ -68,4 +68,4 @@ ccl_device_inline float hash_int_01(uint k)

 CCL_NAMESPACE_END

-#endif /* __UTIL_HASH_H__ */
+#endif  /* __UTIL_HASH_H__ */
--- a/intern/cycles/util/util_ies.h
+++ b/intern/cycles/util/util_ies.h
@@ -58,4 +58,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __UTIL_IES_H__ */
+#endif  /* __UTIL_IES_H__ */
--- a/intern/cycles/util/util_image.h
+++ b/intern/cycles/util/util_image.h
@@ -102,6 +102,6 @@ inline half util_image_cast_from_float(float value)

 CCL_NAMESPACE_END

-#endif /* __UTIL_IMAGE_H__ */
+#endif  /* __UTIL_IMAGE_H__ */

 #include "util/util_image_impl.h"
--- a/intern/cycles/util/util_list.h
+++ b/intern/cycles/util/util_list.h
@@ -25,4 +25,4 @@ using std::list;

 CCL_NAMESPACE_END

-#endif /* __UTIL_LIST_H__ */
+#endif  /* __UTIL_LIST_H__ */
--- a/intern/cycles/util/util_logging.h
+++ b/intern/cycles/util/util_logging.h
@@ -62,4 +62,4 @@ std::ostream& operator <<(std::ostream &os,

 CCL_NAMESPACE_END

-#endif /* __UTIL_LOGGING_H__ */
+#endif  /* __UTIL_LOGGING_H__ */
--- a/intern/cycles/util/util_map.h
+++ b/intern/cycles/util/util_map.h
@@ -28,4 +28,4 @@ using std::unordered_map;

 CCL_NAMESPACE_END

-#endif /* __UTIL_MAP_H__ */
+#endif  /* __UTIL_MAP_H__ */
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -157,7 +157,7 @@ ccl_device_inline T max4(const T& a, const T& b, const T& c, const T& d)
 {
 	return max(max(a,b),max(c,d));
 }
-#endif /* __KERNEL_GPU__ */
+#endif  /* __KERNEL_GPU__ */

 ccl_device_inline float min4(float a, float b, float c, float d)
 {
@@ -244,7 +244,7 @@ ccl_device_inline float4 __int4_as_float4(int4 i)
 	                   __int_as_float(i.w));
 #endif
 }
-#endif /* __KERNEL_OPENCL__ */
+#endif  /* __KERNEL_OPENCL__ */

 /* Versions of functions which are safe for fast math. */
 ccl_device_inline bool isnan_safe(float f)
@@ -639,4 +639,4 @@ ccl_device_inline float2 map_to_sphere(const float3 co)

 CCL_NAMESPACE_END

-#endif /* __UTIL_MATH_H__ */
+#endif  /* __UTIL_MATH_H__ */
--- a/intern/cycles/util/util_math_cdf.h
+++ b/intern/cycles/util/util_math_cdf.h
@@ -75,4 +75,4 @@ void util_cdf_inverted(const int resolution,

 CCL_NAMESPACE_END

-#endif /* __UTIL_MATH_H_CDF__ */
+#endif  /* __UTIL_MATH_H_CDF__ */
--- a/intern/cycles/util/util_math_float2.h
+++ b/intern/cycles/util/util_math_float2.h
@@ -224,4 +224,4 @@ ccl_device_inline float2 interp(const float2& a, const float2& b, float t)

 CCL_NAMESPACE_END

-#endif /* __UTIL_MATH_FLOAT2_H__ */
+#endif  /* __UTIL_MATH_FLOAT2_H__ */
--- a/intern/cycles/util/util_math_float3.h
+++ b/intern/cycles/util/util_math_float3.h
@@ -419,4 +419,4 @@ ccl_device_inline float3 ensure_finite3(float3 v)

 CCL_NAMESPACE_END

-#endif /* __UTIL_MATH_FLOAT3_H__ */
+#endif  /* __UTIL_MATH_FLOAT3_H__ */
--- a/intern/cycles/util/util_math_float4.h
+++ b/intern/cycles/util/util_math_float4.h
@@ -457,4 +457,4 @@ ccl_device_inline float4 load_float4(const float *v)

 CCL_NAMESPACE_END

-#endif /* __UTIL_MATH_FLOAT4_H__ */
+#endif  /* __UTIL_MATH_FLOAT4_H__ */
--- a/intern/cycles/util/util_math_int2.h
+++ b/intern/cycles/util/util_math_int2.h
@@ -74,4 +74,4 @@ ccl_device_inline int2 operator/(const int2 &a, const int2 &b)

 CCL_NAMESPACE_END

-#endif /* __UTIL_MATH_INT2_H__ */
+#endif  /* __UTIL_MATH_INT2_H__ */
--- a/intern/cycles/util/util_math_int3.h
+++ b/intern/cycles/util/util_math_int3.h
@@ -113,4 +113,4 @@ ccl_device_inline int3 operator-(const int3 &a, const int3 &b)

 CCL_NAMESPACE_END

-#endif /* __UTIL_MATH_INT3_H__ */
+#endif  /* __UTIL_MATH_INT3_H__ */
--- a/intern/cycles/util/util_math_int4.h
+++ b/intern/cycles/util/util_math_int4.h
@@ -156,4 +156,4 @@ ccl_device_inline int4 load_int4(const int *v)

 CCL_NAMESPACE_END

-#endif /* __UTIL_MATH_INT4_H__ */
+#endif  /* __UTIL_MATH_INT4_H__ */
--- a/intern/cycles/util/util_math_intersect.h
+++ b/intern/cycles/util/util_math_intersect.h
@@ -219,4 +219,4 @@ ccl_device bool ray_quad_intersect(float3 ray_P, float3 ray_D,

 CCL_NAMESPACE_END

-#endif /* __UTIL_MATH_INTERSECT_H__ */
+#endif  /* __UTIL_MATH_INTERSECT_H__ */
--- a/intern/cycles/util/util_md5.h
+++ b/intern/cycles/util/util_md5.h
@@ -58,4 +58,4 @@ string util_md5_string(const string& str);

 CCL_NAMESPACE_END

-#endif /* __UTIL_MD5_H__ */
+#endif  /* __UTIL_MD5_H__ */
--- a/intern/cycles/util/util_murmurhash.h
+++ b/intern/cycles/util/util_murmurhash.h
@@ -27,4 +27,4 @@ float util_hash_to_float(uint32_t hash);

 CCL_NAMESPACE_END

-#endif /* __UTIL_MURMURHASH_H__ */
+#endif  /* __UTIL_MURMURHASH_H__ */
--- a/intern/cycles/util/util_opengl.h
+++ b/intern/cycles/util/util_opengl.h
@@ -28,4 +28,4 @@
 #  define mxMakeCurrentContext(x) (x)
 #endif

-#endif /* __UTIL_OPENGL_H__ */
+#endif  /* __UTIL_OPENGL_H__ */
--- a/intern/cycles/util/util_optimization.h
+++ b/intern/cycles/util/util_optimization.h
@@ -68,4 +68,4 @@

 #endif

-#endif /* __UTIL_OPTIMIZATION_H__ */
+#endif  /* __UTIL_OPTIMIZATION_H__ */
--- a/intern/cycles/util/util_param.h
+++ b/intern/cycles/util/util_param.h
@@ -30,4 +30,4 @@ OIIO_NAMESPACE_USING

 CCL_NAMESPACE_END

-#endif /* __UTIL_PARAM_H__ */
+#endif  /* __UTIL_PARAM_H__ */
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/util_path.cpp
@@ -614,7 +614,7 @@ bool path_exists(const string& path)
 		return 0;
 	}
 	return st.st_mode != 0;
-#endif /* _WIN32 */
+#endif  /* _WIN32 */
 }

 bool path_is_directory(const string& path)
--- a/intern/cycles/util/util_progress.h
+++ b/intern/cycles/util/util_progress.h
@@ -365,4 +365,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __UTIL_PROGRESS_H__ */
+#endif  /* __UTIL_PROGRESS_H__ */
--- a/intern/cycles/util/util_projection.h
+++ b/intern/cycles/util/util_projection.h
@@ -169,8 +169,8 @@ ccl_device_inline ProjectionTransform projection_orthographic(float znear, float
 	return ProjectionTransform(t);
 }

-#endif /* __KERNEL_GPU__ */
+#endif  /* __KERNEL_GPU__ */

 CCL_NAMESPACE_END

-#endif /* __UTIL_PROJECTION_H__ */
+#endif  /* __UTIL_PROJECTION_H__ */
--- a/intern/cycles/util/util_queue.h
+++ b/intern/cycles/util/util_queue.h
@@ -25,4 +25,4 @@ using std::queue;

 CCL_NAMESPACE_END

-#endif /* __UTIL_LIST_H__ */
+#endif  /* __UTIL_LIST_H__ */
--- a/intern/cycles/util/util_rect.h
+++ b/intern/cycles/util/util_rect.h
@@ -69,4 +69,4 @@ ccl_device_inline int rect_size(int4 rect)

 CCL_NAMESPACE_END

-#endif /* __UTIL_RECT_H__ */
+#endif  /* __UTIL_RECT_H__ */
--- a/intern/cycles/util/util_set.h
+++ b/intern/cycles/util/util_set.h
@@ -31,4 +31,4 @@ using std::unordered_set;

 CCL_NAMESPACE_END

-#endif /* __UTIL_SET_H__ */
+#endif  /* __UTIL_SET_H__ */
--- a/intern/cycles/util/util_simd.h
+++ b/intern/cycles/util/util_simd.h
@@ -219,9 +219,9 @@ __forceinline size_t __bscf(size_t& v)
  return i;
 }

-#endif /* __KERNEL_64_BIT__ */
+#endif  /* __KERNEL_64_BIT__ */

-#else /* _WIN32 */
+#else  /* _WIN32 */

 __forceinline unsigned int __popcnt(unsigned int in) {
  int r = 0; asm ("popcnt %1,%0" : "=r"(r) : "r"(in)); return r;
@@ -344,7 +344,7 @@ __forceinline size_t __bscf(size_t& v)
 }
 #endif

-#endif /* _WIN32 */
+#endif  /* _WIN32 */

 /* Test __KERNEL_SSE41__ for MSVC which does not define __SSE4_1__, and test
 * __SSE4_1__ to avoid OpenImageIO conflicts with our emulation macros on other
@@ -442,7 +442,7 @@ __forceinline __m128 _mm_round_ps_emu( __m128 value, const int flags)
  return value;
 }

-#endif /* !(defined(__KERNEL_SSE41__) || defined(__SSE4_1__) || defined(__SSE4_2__)) */
+#endif  /* !(defined(__KERNEL_SSE41__) || defined(__SSE4_1__) || defined(__SSE4_2__)) */

 #else  /* __KERNEL_SSE2__ */

@@ -470,7 +470,7 @@ ccl_device_inline int __bsr(int value)
 	return bit;
 }

-#endif /* __KERNEL_SSE2__ */
+#endif  /* __KERNEL_SSE2__ */

 /* quiet unused define warnings */
 #if defined(__KERNEL_SSE2__)  || \
@@ -484,6 +484,6 @@ ccl_device_inline int __bsr(int value)

 CCL_NAMESPACE_END

-#endif /* __KERNEL_GPU__ */
+#endif  /* __KERNEL_GPU__ */

-#endif /* __UTIL_SIMD_TYPES_H__ */
+#endif  /* __UTIL_SIMD_TYPES_H__ */
--- a/intern/cycles/util/util_sky_model.h
+++ b/intern/cycles/util/util_sky_model.h
@@ -437,6 +437,6 @@ double arhosekskymodel_solar_radiance(ArHosekSkyModelState* state,
                                      double wavelength);


-#endif // _SKY_MODEL_H_
+#endif  // _SKY_MODEL_H_

 CCL_NAMESPACE_END
--- a/intern/cycles/util/util_static_assert.h
+++ b/intern/cycles/util/util_static_assert.h
@@ -47,4 +47,4 @@ CCL_NAMESPACE_BEGIN

 CCL_NAMESPACE_END

-#endif /* __UTIL_STATIC_ASSERT_H__ */
+#endif  /* __UTIL_STATIC_ASSERT_H__ */
--- a/intern/cycles/util/util_stats.h
+++ b/intern/cycles/util/util_stats.h
@@ -44,4 +44,4 @@ public:

 CCL_NAMESPACE_END

-#endif /* __UTIL_STATS_H__ */
+#endif  /* __UTIL_STATS_H__ */
--- a/intern/cycles/util/util_string.h
+++ b/intern/cycles/util/util_string.h
@@ -74,4 +74,4 @@ string string_human_readable_number(size_t num);

 CCL_NAMESPACE_END

-#endif /* __UTIL_STRING_H__ */
+#endif  /* __UTIL_STRING_H__ */
--- a/intern/cycles/util/util_system.h
+++ b/intern/cycles/util/util_system.h
@@ -46,4 +46,4 @@ size_t system_physical_ram();

 CCL_NAMESPACE_END

-#endif /* __UTIL_SYSTEM_H__ */
+#endif  /* __UTIL_SYSTEM_H__ */
--- a/intern/cycles/util/util_texture.h
+++ b/intern/cycles/util/util_texture.h
@@ -89,4 +89,4 @@ typedef struct TextureInfo {

 CCL_NAMESPACE_END

-#endif /* __UTIL_TEXTURE_H__ */
+#endif  /* __UTIL_TEXTURE_H__ */
--- a/intern/cycles/util/util_thread.h
+++ b/intern/cycles/util/util_thread.h
@@ -138,4 +138,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __UTIL_THREAD_H__ */
+#endif  /* __UTIL_THREAD_H__ */
--- a/intern/cycles/util/util_transform.h
+++ b/intern/cycles/util/util_transform.h
@@ -495,4 +495,4 @@ OPENCL_TRANSFORM_ADDRSPACE_DECLARE(transform_direction_transposed)

 CCL_NAMESPACE_END

-#endif /* __UTIL_TRANSFORM_H__ */
+#endif  /* __UTIL_TRANSFORM_H__ */
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -156,4 +156,4 @@ CCL_NAMESPACE_END
 #endif
 #endif

-#endif /* __UTIL_TYPES_H__ */
+#endif  /* __UTIL_TYPES_H__ */
--- a/intern/cycles/util/util_vector.h
+++ b/intern/cycles/util/util_vector.h
@@ -336,4 +336,4 @@ protected:

 CCL_NAMESPACE_END

-#endif /* __UTIL_VECTOR_H__ */
+#endif  /* __UTIL_VECTOR_H__ */
--- a/intern/cycles/util/util_version.h
+++ b/intern/cycles/util/util_version.h
@@ -34,4 +34,4 @@ CCL_NAMESPACE_BEGIN

 CCL_NAMESPACE_END

-#endif /* __UTIL_VERSION_H__ */
+#endif  /* __UTIL_VERSION_H__ */
--- a/intern/cycles/util/util_view.h
+++ b/intern/cycles/util/util_view.h
@@ -40,4 +40,4 @@ void view_redraw();

 CCL_NAMESPACE_END

-#endif /*__UTIL_VIEW_H__*/
+#endif  /*__UTIL_VIEW_H__*/
--- a/intern/cycles/util/util_windows.h
+++ b/intern/cycles/util/util_windows.h
@@ -56,4 +56,4 @@ CCL_NAMESPACE_END

 #endif  /* WIN32 */

-#endif /* __UTIL_WINDOWS_H__ */
+#endif  /* __UTIL_WINDOWS_H__ */
--- a/intern/cycles/util/util_xml.h
+++ b/intern/cycles/util/util_xml.h
@@ -38,4 +38,4 @@ using PUGIXML_NAMESPACE::xml_parse_result;

 CCL_NAMESPACE_END

-#endif /* __UTIL_XML_H__ */
+#endif  /* __UTIL_XML_H__ */