sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Cleanup, spacing after preprocessor

Browse Source 
It is supposed to be two spaces before comment stating which if
else/endif statements corresponds to. Was mainly violated in the
header guards.
This commit is contained in:
Sergey Sharybin 2018-11-09 11:34:54 +01:00
parent 33039a4602
commit cb4b5e12ab
176 changed files with 244 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/app/cycles_xml.h
View File

@ -29,4 +29,4 @@ void xml_read_file(Scene *scene, const char *filepath);
CCL_NAMESPACE_END
#endif /* __CYCLES_XML_H__ */
#endif /* __CYCLES_XML_H__ */

2
intern/cycles/blender/CCL_api.h
View File

@ -33,4 +33,4 @@ void CCL_logging_verbosity_set(int verbosity);
}
#endif
#endif /* __CCL_API_H__ */
#endif /* __CCL_API_H__ */

2
intern/cycles/blender/blender_object_cull.h
View File

@ -46,4 +46,4 @@ private:
CCL_NAMESPACE_END
#endif /* __BLENDER_OBJECT_CULL_H__ */
#endif /* __BLENDER_OBJECT_CULL_H__ */

8
intern/cycles/blender/blender_python.cpp
View File

@ -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;
}

2
intern/cycles/blender/blender_session.h
View File

@ -176,4 +176,4 @@ protected:
CCL_NAMESPACE_END
#endif /* __BLENDER_SESSION_H__ */
#endif /* __BLENDER_SESSION_H__ */

2
intern/cycles/blender/blender_sync.h
View File

@ -213,4 +213,4 @@ private:
CCL_NAMESPACE_END
#endif /* __BLENDER_SYNC_H__ */
#endif /* __BLENDER_SYNC_H__ */

2
intern/cycles/blender/blender_util.h
View File

@ -838,4 +838,4 @@ protected:
CCL_NAMESPACE_END
#endif /* __BLENDER_UTIL_H__ */
#endif /* __BLENDER_UTIL_H__ */

2
intern/cycles/bvh/bvh.h
View File

@ -126,4 +126,4 @@ struct BVHStackEntry
CCL_NAMESPACE_END
#endif /* __BVH_H__ */
#endif /* __BVH_H__ */

2
intern/cycles/bvh/bvh2.h
View File

@ -84,4 +84,4 @@ protected:
CCL_NAMESPACE_END
#endif /* __BVH2_H__ */
#endif /* __BVH2_H__ */

2
intern/cycles/bvh/bvh4.h
View File

@ -84,4 +84,4 @@ protected:
CCL_NAMESPACE_END
#endif /* __BVH4_H__ */
#endif /* __BVH4_H__ */

2
intern/cycles/bvh/bvh8.h
View File

@ -95,4 +95,4 @@ protected:
CCL_NAMESPACE_END
#endif /* __BVH8_H__ */
#endif /* __BVH8_H__ */

2
intern/cycles/bvh/bvh_build.h
View File

@ -142,4 +142,4 @@ protected:
CCL_NAMESPACE_END
#endif /* __BVH_BUILD_H__ */
#endif /* __BVH_BUILD_H__ */

2
intern/cycles/bvh/bvh_embree.cpp
View File

@ -881,4 +881,4 @@ void BVHEmbree::refit_nodes()
}
CCL_NAMESPACE_END
#endif /* WITH_EMBREE */
#endif /* WITH_EMBREE */

4
intern/cycles/bvh/bvh_embree.h
View File

@ -74,6 +74,6 @@ private:
CCL_NAMESPACE_END
#endif /* WITH_EMBREE */
#endif /* WITH_EMBREE */
#endif /* __BVH_EMBREE_H__ */
#endif /* __BVH_EMBREE_H__ */

2
intern/cycles/bvh/bvh_node.h
View File

@ -169,4 +169,4 @@ public:
CCL_NAMESPACE_END
#endif /* __BVH_NODE_H__ */
#endif /* __BVH_NODE_H__ */

2
intern/cycles/bvh/bvh_params.h
View File

@ -286,4 +286,4 @@ struct BVHSpatialStorage {
CCL_NAMESPACE_END
#endif /* __BVH_PARAMS_H__ */
#endif /* __BVH_PARAMS_H__ */

2
intern/cycles/bvh/bvh_sort.h
View File

@ -35,4 +35,4 @@ void bvh_reference_sort(int start,
CCL_NAMESPACE_END
#endif /* __BVH_SORT_H__ */
#endif /* __BVH_SORT_H__ */

2
intern/cycles/bvh/bvh_split.h
View File

@ -259,4 +259,4 @@ public:
CCL_NAMESPACE_END
#endif /* __BVH_SPLIT_H__ */
#endif /* __BVH_SPLIT_H__ */

2
intern/cycles/bvh/bvh_unaligned.h
View File

@ -77,4 +77,4 @@ protected:
CCL_NAMESPACE_END
#endif /* __BVH_UNALIGNED_H__ */
#endif /* __BVH_UNALIGNED_H__ */

2
intern/cycles/device/device.h
View File

@ -360,4 +360,4 @@ private:
CCL_NAMESPACE_END
#endif /* __DEVICE_H__ */
#endif /* __DEVICE_H__ */

2
intern/cycles/device/device_cpu.cpp
View File

@ -288,7 +288,7 @@ public:
}
#ifdef WITH_EMBREE
bvh_layout_mask |= BVH_LAYOUT_EMBREE;
#endif /* WITH_EMBREE */
#endif /* WITH_EMBREE */
return bvh_layout_mask;
}

2
intern/cycles/device/device_cuda.cpp
View File

@ -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)

2
intern/cycles/device/device_denoising.h
View File

@ -166,4 +166,4 @@ protected:
CCL_NAMESPACE_END
#endif /* __DEVICE_DENOISING_H__ */
#endif /* __DEVICE_DENOISING_H__ */

2
intern/cycles/device/device_intern.h
View File

@ -40,4 +40,4 @@ string device_cuda_capabilities(void);
CCL_NAMESPACE_END
#endif /* __DEVICE_INTERN_H__ */
#endif /* __DEVICE_INTERN_H__ */

2
intern/cycles/device/device_memory.h
View File

@ -496,4 +496,4 @@ protected:
CCL_NAMESPACE_END
#endif /* __DEVICE_MEMORY_H__ */
#endif /* __DEVICE_MEMORY_H__ */

2
intern/cycles/device/device_network.h
View File

@ -488,4 +488,4 @@ CCL_NAMESPACE_END
#endif
#endif /* __DEVICE_NETWORK_H__ */
#endif /* __DEVICE_NETWORK_H__ */

2
intern/cycles/device/device_opencl.cpp
View File

@ -245,4 +245,4 @@ string device_opencl_capabilities(void)
CCL_NAMESPACE_END
#endif /* WITH_OPENCL */
#endif /* WITH_OPENCL */

2
intern/cycles/device/device_split_kernel.h
View File

@ -130,4 +130,4 @@ public:
CCL_NAMESPACE_END
#endif /* __DEVICE_SPLIT_KERNEL_H__ */
#endif /* __DEVICE_SPLIT_KERNEL_H__ */

2
intern/cycles/device/device_task.h
View File

@ -85,4 +85,4 @@ protected:
CCL_NAMESPACE_END
#endif /* __DEVICE_TASK_H__ */
#endif /* __DEVICE_TASK_H__ */

2
intern/cycles/device/opencl/opencl_split.cpp
View File

@ -463,4 +463,4 @@ Device *opencl_create_split_device(DeviceInfo& info, Stats& stats, bool backgrou
CCL_NAMESPACE_END
#endif /* WITH_OPENCL */
#endif /* WITH_OPENCL */

42
intern/cycles/kernel/bvh/bvh.h
View File

@ -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__ */

4
intern/cycles/kernel/bvh/bvh_local.h
View File

@ -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);

4
intern/cycles/kernel/bvh/bvh_shadow_all.h
View File

@ -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);

4
intern/cycles/kernel/bvh/bvh_traversal.h
View File

@ -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);

4
intern/cycles/kernel/bvh/bvh_volume.h
View File

@ -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);

4
intern/cycles/kernel/bvh/bvh_volume_all.h
View File

@ -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);

2
intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_diffuse.h
View File

@ -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__ */

4
intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_hair.h
View File

@ -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__ */

4
intern/cycles/kernel/closure/bsdf_hair_principled.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_microfacet.h
View File

@ -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__ */

8
intern/cycles/kernel/closure/bsdf_microfacet_multi_impl.h
View File

@ -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);

2
intern/cycles/kernel/closure/bsdf_oren_nayar.h
View File

@ -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__ */

4
intern/cycles/kernel/closure/bsdf_phong_ramp.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_principled_diffuse.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_principled_sheen.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_reflection.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_refraction.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_toon.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_transparent.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bsdf_util.h
View File

@ -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__ */

2
intern/cycles/kernel/closure/bssrdf.h
View File

@ -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__ */

2
intern/cycles/kernel/filter/filter.h
View File

@ -49,4 +49,4 @@ CCL_NAMESPACE_BEGIN
CCL_NAMESPACE_END
#endif /* __FILTER_H__ */
#endif /* __FILTER_H__ */

2
intern/cycles/kernel/filter/filter_defines.h
View File

@ -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__*/

2
intern/cycles/kernel/geom/geom_curve_intersect.h
View File

@ -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;
}

4
intern/cycles/kernel/geom/geom_subd_triangle.h
View File

@ -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);

2
intern/cycles/kernel/geom/geom_triangle_intersect.h
View File

@ -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

2
intern/cycles/kernel/kernel.h
View File

@ -63,4 +63,4 @@ void kernel_tex_copy(KernelGlobals *kg,
CCL_NAMESPACE_END
#endif /* __KERNEL_H__ */
#endif /* __KERNEL_H__ */

2
intern/cycles/kernel/kernel_color.h
View File

@ -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__ */

2
intern/cycles/kernel/kernel_compat_cpu.h
View File

@ -153,4 +153,4 @@ typedef vector3<avxf> avx3f;
CCL_NAMESPACE_END
#endif /* __KERNEL_COMPAT_CPU_H__ */
#endif /* __KERNEL_COMPAT_CPU_H__ */

2
intern/cycles/kernel/kernel_compat_cuda.h
View File

@ -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__ */

2
intern/cycles/kernel/kernel_compat_opencl.h
View File

@ -159,4 +159,4 @@
#include "util/util_half.h"
#include "util/util_types.h"
#endif /* __KERNEL_COMPAT_OPENCL_H__ */
#endif /* __KERNEL_COMPAT_OPENCL_H__ */

4
intern/cycles/kernel/kernel_id_passes.h
View File

@ -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__ */
}
}

2
intern/cycles/kernel/kernel_math.h
View File

@ -25,4 +25,4 @@
#include "util/util_texture.h"
#include "util/util_transform.h"
#endif /* __KERNEL_MATH_H__ */
#endif /* __KERNEL_MATH_H__ */

2
intern/cycles/kernel/kernel_montecarlo.h
View File

@ -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__ */

8
intern/cycles/kernel/kernel_passes.h
View File

@ -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;
}

8
intern/cycles/kernel/kernel_path.h
View File

@ -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) {

8
intern/cycles/kernel/kernel_path_volume.h
View File

@ -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

2
intern/cycles/kernel/kernel_queues.h
View File

@ -145,4 +145,4 @@ ccl_device int dequeue_ray_index(
CCL_NAMESPACE_END
#endif // __KERNEL_QUEUE_H__
#endif // __KERNEL_QUEUE_H__

2
intern/cycles/kernel/kernel_random.h
View File

@ -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,

2
intern/cycles/kernel/kernel_shadow.h
View File

@ -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,

4
intern/cycles/kernel/kernel_types.h
View File

@ -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__ */

8
intern/cycles/kernel/kernel_volume.h
View File

@ -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

2
intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
View File

@ -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__

10
intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
View File

@ -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)

2
intern/cycles/kernel/osl/osl_closures.h
View File

@ -146,4 +146,4 @@ CCLOSURE_PREPARE_STATIC(bsdf_##lower##_prepare, Upper##Closure)
CCL_NAMESPACE_END
#endif /* __OSL_CLOSURES_H__ */
#endif /* __OSL_CLOSURES_H__ */

2
intern/cycles/kernel/osl/osl_globals.h
View File

@ -94,4 +94,4 @@ CCL_NAMESPACE_END
#endif
#endif /* __OSL_GLOBALS_H__ */
#endif /* __OSL_GLOBALS_H__ */

2
intern/cycles/kernel/osl/osl_services.h
View File

@ -199,4 +199,4 @@ private:
CCL_NAMESPACE_END
#endif /* __OSL_SERVICES_H__ */
#endif /* __OSL_SERVICES_H__ */

2
intern/cycles/kernel/osl/osl_shader.h
View File

@ -66,4 +66,4 @@ CCL_NAMESPACE_END
#endif
#endif /* __OSL_SHADER_H__ */
#endif /* __OSL_SHADER_H__ */

2
intern/cycles/kernel/shaders/oslutil.h
View File

@ -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 */

4
intern/cycles/kernel/shaders/stdosl.h
View File

@ -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 */

4
intern/cycles/kernel/split/kernel_shader_sort.h
View File

@ -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

4
intern/cycles/kernel/split/kernel_split_data_types.h
View File

@ -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) \

4
intern/cycles/kernel/svm/svm.h
View File

@ -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__ */

2
intern/cycles/kernel/svm/svm_closure.h
View File

@ -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);
}
}

2
intern/cycles/kernel/svm/svm_hsv.h
View File

@ -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__ */

2
intern/cycles/kernel/svm/svm_ramp.h
View File

@ -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__ */

2
intern/cycles/kernel/svm/svm_ramp_util.h
View File

@ -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__ */

2
intern/cycles/kernel/svm/svm_types.h
View File

@ -531,4 +531,4 @@ typedef enum ClosureType {
CCL_NAMESPACE_END
#endif /* __SVM_TYPES_H__ */
#endif /* __SVM_TYPES_H__ */

2
intern/cycles/kernel/svm/svm_wave.h
View File

@ -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)

2
intern/cycles/render/attribute.h
View File

@ -172,4 +172,4 @@ public:
CCL_NAMESPACE_END
#endif /* __ATTRIBUTE_H__ */
#endif /* __ATTRIBUTE_H__ */

2
intern/cycles/render/background.h
View File

@ -59,4 +59,4 @@ public:
CCL_NAMESPACE_END
#endif /* __BACKGROUND_H__ */
#endif /* __BACKGROUND_H__ */

2
intern/cycles/render/bake.h
View File

@ -83,4 +83,4 @@ private:
CCL_NAMESPACE_END
#endif /* __BAKE_H__ */
#endif /* __BAKE_H__ */

2
intern/cycles/render/buffers.h
View File

@ -146,4 +146,4 @@ public:
CCL_NAMESPACE_END
#endif /* __BUFFERS_H__ */
#endif /* __BUFFERS_H__ */

2
intern/cycles/render/camera.h
View File

@ -212,4 +212,4 @@ private:
CCL_NAMESPACE_END
#endif /* __CAMERA_H__ */
#endif /* __CAMERA_H__ */

2
intern/cycles/render/constant_fold.h
View File

@ -70,4 +70,4 @@ public:
CCL_NAMESPACE_END
#endif /* __CONSTANT_FOLD_H__ */
#endif /* __CONSTANT_FOLD_H__ */

2
intern/cycles/render/coverage.h
View File

@ -46,4 +46,4 @@ private:
CCL_NAMESPACE_END
#endif /* __COVERAGE_H__ */
#endif /* __COVERAGE_H__ */

2
intern/cycles/render/curves.h
View File

@ -119,4 +119,4 @@ public:
CCL_NAMESPACE_END
#endif /* __CURVES_H__ */
#endif /* __CURVES_H__ */

Some files were not shown because too many files have changed in this diff Show More