Cycles: Cleanup, spacing after preprocessor
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Nov 2018 10:34:54 +0000 (11:34 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Nov 2018 10:34:54 +0000 (11:34 +0100)
It is supposed to be two spaces before comment stating which if
else/endif statements corresponds to. Was mainly violated in the
header guards.

176 files changed:
intern/cycles/app/cycles_xml.h
intern/cycles/blender/CCL_api.h
intern/cycles/blender/blender_object_cull.h
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_session.h
intern/cycles/blender/blender_sync.h
intern/cycles/blender/blender_util.h
intern/cycles/bvh/bvh.h
intern/cycles/bvh/bvh2.h
intern/cycles/bvh/bvh4.h
intern/cycles/bvh/bvh8.h
intern/cycles/bvh/bvh_build.h
intern/cycles/bvh/bvh_embree.cpp
intern/cycles/bvh/bvh_embree.h
intern/cycles/bvh/bvh_node.h
intern/cycles/bvh/bvh_params.h
intern/cycles/bvh/bvh_sort.h
intern/cycles/bvh/bvh_split.h
intern/cycles/bvh/bvh_unaligned.h
intern/cycles/device/device.h
intern/cycles/device/device_cpu.cpp
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_denoising.h
intern/cycles/device/device_intern.h
intern/cycles/device/device_memory.h
intern/cycles/device/device_network.h
intern/cycles/device/device_opencl.cpp
intern/cycles/device/device_split_kernel.h
intern/cycles/device/device_task.h
intern/cycles/device/opencl/opencl_split.cpp
intern/cycles/kernel/bvh/bvh.h
intern/cycles/kernel/bvh/bvh_local.h
intern/cycles/kernel/bvh/bvh_shadow_all.h
intern/cycles/kernel/bvh/bvh_traversal.h
intern/cycles/kernel/bvh/bvh_volume.h
intern/cycles/kernel/bvh/bvh_volume_all.h
intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h
intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
intern/cycles/kernel/closure/bsdf_diffuse.h
intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
intern/cycles/kernel/closure/bsdf_hair.h
intern/cycles/kernel/closure/bsdf_hair_principled.h
intern/cycles/kernel/closure/bsdf_microfacet.h
intern/cycles/kernel/closure/bsdf_microfacet_multi_impl.h
intern/cycles/kernel/closure/bsdf_oren_nayar.h
intern/cycles/kernel/closure/bsdf_phong_ramp.h
intern/cycles/kernel/closure/bsdf_principled_diffuse.h
intern/cycles/kernel/closure/bsdf_principled_sheen.h
intern/cycles/kernel/closure/bsdf_reflection.h
intern/cycles/kernel/closure/bsdf_refraction.h
intern/cycles/kernel/closure/bsdf_toon.h
intern/cycles/kernel/closure/bsdf_transparent.h
intern/cycles/kernel/closure/bsdf_util.h
intern/cycles/kernel/closure/bssrdf.h
intern/cycles/kernel/filter/filter.h
intern/cycles/kernel/filter/filter_defines.h
intern/cycles/kernel/geom/geom_curve_intersect.h
intern/cycles/kernel/geom/geom_subd_triangle.h
intern/cycles/kernel/geom/geom_triangle_intersect.h
intern/cycles/kernel/kernel.h
intern/cycles/kernel/kernel_color.h
intern/cycles/kernel/kernel_compat_cpu.h
intern/cycles/kernel/kernel_compat_cuda.h
intern/cycles/kernel/kernel_compat_opencl.h
intern/cycles/kernel/kernel_id_passes.h
intern/cycles/kernel/kernel_math.h
intern/cycles/kernel/kernel_montecarlo.h
intern/cycles/kernel/kernel_passes.h
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_path_volume.h
intern/cycles/kernel/kernel_queues.h
intern/cycles/kernel/kernel_random.h
intern/cycles/kernel/kernel_shadow.h
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/kernel_volume.h
intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
intern/cycles/kernel/osl/osl_closures.h
intern/cycles/kernel/osl/osl_globals.h
intern/cycles/kernel/osl/osl_services.h
intern/cycles/kernel/osl/osl_shader.h
intern/cycles/kernel/shaders/oslutil.h
intern/cycles/kernel/shaders/stdosl.h
intern/cycles/kernel/split/kernel_shader_sort.h
intern/cycles/kernel/split/kernel_split_data_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_closure.h
intern/cycles/kernel/svm/svm_hsv.h
intern/cycles/kernel/svm/svm_ramp.h
intern/cycles/kernel/svm/svm_ramp_util.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/kernel/svm/svm_wave.h
intern/cycles/render/attribute.h
intern/cycles/render/background.h
intern/cycles/render/bake.h
intern/cycles/render/buffers.h
intern/cycles/render/camera.h
intern/cycles/render/constant_fold.h
intern/cycles/render/coverage.h
intern/cycles/render/curves.h
intern/cycles/render/film.h
intern/cycles/render/graph.h
intern/cycles/render/image.h
intern/cycles/render/integrator.h
intern/cycles/render/light.h
intern/cycles/render/mesh.h
intern/cycles/render/nodes.h
intern/cycles/render/object.h
intern/cycles/render/osl.cpp
intern/cycles/render/osl.h
intern/cycles/render/particles.h
intern/cycles/render/scene.h
intern/cycles/render/session.h
intern/cycles/render/shader.h
intern/cycles/render/sobol.h
intern/cycles/render/stats.h
intern/cycles/render/svm.cpp
intern/cycles/render/svm.h
intern/cycles/render/tables.h
intern/cycles/render/tile.h
intern/cycles/subd/subd_dice.h
intern/cycles/subd/subd_patch.h
intern/cycles/subd/subd_patch_table.h
intern/cycles/subd/subd_split.h
intern/cycles/test/util_path_test.cpp
intern/cycles/util/util_algorithm.h
intern/cycles/util/util_args.h
intern/cycles/util/util_atomic.h
intern/cycles/util/util_boundbox.h
intern/cycles/util/util_color.h
intern/cycles/util/util_debug.h
intern/cycles/util/util_defines.h
intern/cycles/util/util_foreach.h
intern/cycles/util/util_function.h
intern/cycles/util/util_half.h
intern/cycles/util/util_hash.h
intern/cycles/util/util_ies.h
intern/cycles/util/util_image.h
intern/cycles/util/util_list.h
intern/cycles/util/util_logging.h
intern/cycles/util/util_map.h
intern/cycles/util/util_math.h
intern/cycles/util/util_math_cdf.h
intern/cycles/util/util_math_float2.h
intern/cycles/util/util_math_float3.h
intern/cycles/util/util_math_float4.h
intern/cycles/util/util_math_int2.h
intern/cycles/util/util_math_int3.h
intern/cycles/util/util_math_int4.h
intern/cycles/util/util_math_intersect.h
intern/cycles/util/util_md5.h
intern/cycles/util/util_murmurhash.h
intern/cycles/util/util_opengl.h
intern/cycles/util/util_optimization.h
intern/cycles/util/util_param.h
intern/cycles/util/util_path.cpp
intern/cycles/util/util_progress.h
intern/cycles/util/util_projection.h
intern/cycles/util/util_queue.h
intern/cycles/util/util_rect.h
intern/cycles/util/util_set.h
intern/cycles/util/util_simd.h
intern/cycles/util/util_sky_model.h
intern/cycles/util/util_static_assert.h
intern/cycles/util/util_stats.h
intern/cycles/util/util_string.h
intern/cycles/util/util_system.h
intern/cycles/util/util_texture.h
intern/cycles/util/util_thread.h
intern/cycles/util/util_transform.h
intern/cycles/util/util_types.h
intern/cycles/util/util_vector.h
intern/cycles/util/util_version.h
intern/cycles/util/util_view.h
intern/cycles/util/util_windows.h
intern/cycles/util/util_xml.h

index 6a48980d8eadd9f7a08ce74ab93435a51facb31d..a7bc1895d4e946191b8e4efb19230a9df68d3a79 100644 (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__ */
index 233ffc8802ce37119dbac8ea432975002eef3586..b9750ad0c538c85ecfda0da5b6a054668b35d676 100644 (file)
@@ -33,4 +33,4 @@ void CCL_logging_verbosity_set(int verbosity);
 }
 #endif
 
-#endif /* __CCL_API_H__ */
+#endif  /* __CCL_API_H__ */
index 2147877a8609c22976be2f0a1f539e7903e30046..6e2a22438ecfe6c48252b50552814ebd842cae0b 100644 (file)
@@ -46,4 +46,4 @@ private:
 
 CCL_NAMESPACE_END
 
-#endif /* __BLENDER_OBJECT_CULL_H__ */
+#endif  /* __BLENDER_OBJECT_CULL_H__ */
index 997176f9d449de6de234d020a917863d4a4d1a11..8b3bec56d1fd002a8eef1a0e009e856186adf7b9 100644 (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;
 }
index 540fa6a8a845586d74bbb387c4bf47f59ecad6bc..82d828c5dc4689a03ec371f3b14065af4b90a135 100644 (file)
@@ -176,4 +176,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __BLENDER_SESSION_H__ */
+#endif  /* __BLENDER_SESSION_H__ */
index eb84bedb1184e4c2e489e4791d03aa742de15b8e..6d78f62c7d090423bff68589f95a2bd896e3a667 100644 (file)
@@ -213,4 +213,4 @@ private:
 
 CCL_NAMESPACE_END
 
-#endif /* __BLENDER_SYNC_H__ */
+#endif  /* __BLENDER_SYNC_H__ */
index 09ae9bea313d5c127c4f4ea73c4a33b10212a4fc..8f5fb5971ff676ae36f9ff3b25f9f1355a6dd0a2 100644 (file)
@@ -838,4 +838,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __BLENDER_UTIL_H__ */
+#endif  /* __BLENDER_UTIL_H__ */
index f14c8f53c80f8c0672c3ff3593c3510249cd1451..9c290139e74b9a060ebc8cbf46469771092e2886 100644 (file)
@@ -126,4 +126,4 @@ struct BVHStackEntry
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH_H__ */
+#endif  /* __BVH_H__ */
index df65ddca5b7ba1f951377cd632ac2c7c36f0025f..ecc697567bbef6e3968918c71e050bc61157a92a 100644 (file)
@@ -84,4 +84,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH2_H__ */
+#endif  /* __BVH2_H__ */
index 310909a37e11eff644114753bf472a40d6764635..28bab2fe3275c633bd77a71dcb08f08bf3509687 100644 (file)
@@ -84,4 +84,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH4_H__ */
+#endif  /* __BVH4_H__ */
index 274a2442c7e6fa870b85ae5557b455c41fb02aa9..834daf3abce8aa16c30a145c9890304122edb11b 100644 (file)
@@ -95,4 +95,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH8_H__ */
+#endif  /* __BVH8_H__ */
index 7b2451398199eb2f6199a7cf7377c9a453cfd1f6..6dae5a9e6bf041e30d1bbb918b4f610cf0e27eeb 100644 (file)
@@ -142,4 +142,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH_BUILD_H__ */
+#endif  /* __BVH_BUILD_H__ */
index 87891b68c4b4bad68bb5fd77735bd52613624391..7489fe8ea42d3c2559a5836193401ab28d55566f 100644 (file)
@@ -881,4 +881,4 @@ void BVHEmbree::refit_nodes()
 }
 CCL_NAMESPACE_END
 
-#endif /* WITH_EMBREE */
+#endif  /* WITH_EMBREE */
index 4b3219d575eb065baa0f3ec183e46ed900d41471..9990826ba98e2f587893aeb4d6153b85f4a6bd49 100644 (file)
@@ -74,6 +74,6 @@ private:
 
 CCL_NAMESPACE_END
 
-#endif /* WITH_EMBREE */
+#endif  /* WITH_EMBREE */
 
-#endif /* __BVH_EMBREE_H__ */
+#endif  /* __BVH_EMBREE_H__ */
index ed89d52a50a2e51b8d2fcf6a810eff10a36c8bd4..65d5df01158ec79334102771a6357cc69207530e 100644 (file)
@@ -169,4 +169,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH_NODE_H__ */
+#endif  /* __BVH_NODE_H__ */
index ebede6af4a3cb081459c91496e010cb20e2b3593..6408d56da804011406259567ab032ee2f7b25fa0 100644 (file)
@@ -286,4 +286,4 @@ struct BVHSpatialStorage {
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH_PARAMS_H__ */
+#endif  /* __BVH_PARAMS_H__ */
index 936401d8607b951c9ea01485d7ed680d80cfa905..6910cc1e9b4ac1eb111028f0ef7c8a50e5a5c6c1 100644 (file)
@@ -35,4 +35,4 @@ void bvh_reference_sort(int start,
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH_SORT_H__ */
+#endif  /* __BVH_SORT_H__ */
index a874a118b991d900e76beaa26e1226bdd0bc1011..cb47deab211628f5e4a4069b1f35e06a94e2fc45 100644 (file)
@@ -259,4 +259,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH_SPLIT_H__ */
+#endif  /* __BVH_SPLIT_H__ */
index c3ece051cd5a89081295463ad8f7d0a06373efcc..bcfb6ed68daadaabd2ab0a4b4fb71e4298fe5af8 100644 (file)
@@ -77,4 +77,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH_UNALIGNED_H__ */
+#endif  /* __BVH_UNALIGNED_H__ */
index 54a3ae1fe9f7d4b2bd3b1cdc98dec8931ca7587e..f49915bc40d9530aefa56bb01f873a08fe84d95a 100644 (file)
@@ -360,4 +360,4 @@ private:
 
 CCL_NAMESPACE_END
 
-#endif /* __DEVICE_H__ */
+#endif  /* __DEVICE_H__ */
index 9e27a48b34120324905db92df3635b983c15ac5d..bb5e9980457cd9173bf680ce64de427b0a3df014 100644 (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;
        }
 
index f0e58f22ad40733c844241fd118cd91073a44844..a52e77f707b3f8fadbc662faa31422d2d3fd9248 100644 (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)
index 7474f71ff782667490cd0e7de8fae32a189a5f41..8e0666d0e59cce05648077d00a8ceb11d4c93fd0 100644 (file)
@@ -166,4 +166,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __DEVICE_DENOISING_H__ */
+#endif  /* __DEVICE_DENOISING_H__ */
index 941be448101d925a7157744b8614e58d18ce2b94..d5a96c2b82b20a2d876f858b3a12df1660203b49 100644 (file)
@@ -40,4 +40,4 @@ string device_cuda_capabilities(void);
 
 CCL_NAMESPACE_END
 
-#endif /* __DEVICE_INTERN_H__ */
+#endif  /* __DEVICE_INTERN_H__ */
index 2b4835c9c658f5968b696c38c59136c88e635db4..1801cda0de05a0ebcf1b49f9d3d31b919fd71fe8 100644 (file)
@@ -496,4 +496,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __DEVICE_MEMORY_H__ */
+#endif  /* __DEVICE_MEMORY_H__ */
index 96e0de742dbeeb166262b227e5ad36b0d8c576c0..67626ae177fc3176a48a5ead74e362db1e9e7b6d 100644 (file)
@@ -488,4 +488,4 @@ CCL_NAMESPACE_END
 
 #endif
 
-#endif /* __DEVICE_NETWORK_H__ */
+#endif  /* __DEVICE_NETWORK_H__ */
index 0f622430abbdaebe66a391bf63a4b7154bc3ff91..036f8a2e6e7e904599dff94089aabfe9827dbccf 100644 (file)
@@ -245,4 +245,4 @@ string device_opencl_capabilities(void)
 
 CCL_NAMESPACE_END
 
-#endif /* WITH_OPENCL */
+#endif  /* WITH_OPENCL */
index 26ddce5bb2280286ba6004ea4d1d13bfcd4c5dcb..5af4367d1b65dfd2c18e8f553be57a352a86d360 100644 (file)
@@ -130,4 +130,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __DEVICE_SPLIT_KERNEL_H__ */
+#endif  /* __DEVICE_SPLIT_KERNEL_H__ */
index ec87aa8c5600b756c0da715b02db48c22084b7bc..db27470a03fe04469ca2c56ddf1c81ff43c4181e 100644 (file)
@@ -85,4 +85,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __DEVICE_TASK_H__ */
+#endif  /* __DEVICE_TASK_H__ */
index 83389ef7cc8e5efa8fa5db0ca754cd0ab622c5c9..adb73bc6e2c1c1daf9cbb93a3b92ccd02878b2fd 100644 (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 */
index 0d39ac8f5ecc7eefa3eb6a88a818cb19c9d58fd2..57c850b8ef8b5166ad2131a0e030d21626a94e3d 100644 (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__ */
index 2b02f4527bb7d01e944bd96c2224d457ad6d3cb6..8364bc3aa9a1b7109b393ca960836b1a6399ef79 100644 (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);
index d525b29fd94be22749a2fd14b120d882a30eba4b..64eb2f3f6592426138bcfcd01c2c299acfbaddb1 100644 (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);
index e95d2408201b886889be959e660e2a1b85d14208..af9f04db0bae51c5c4990c44cbdb62867a0037c7 100644 (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);
index 7d03855cb8fb43d79406e6ccc13da0e17c970c03..12d4c5eb94ab30bcea7a80d2e7ea3692901e977e 100644 (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);
index 3d9b598914f4d1443da65014d8b9d592a6461abd..6205b9bcf7a9eed6a8fba82cc1064ea456385490 100644 (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);
index ff238b7a8349e0401ff00936575d048b8652f81d..4e7425bd80065c4805c5c205a176ab60b8ec2884 100644 (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__ */
index b0bdea723b98c4fc65057c8b631db818f98c7495..80fd9ba2b37d6d009e1a281cf52d6e231aa19d9d 100644 (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__ */
index ee6d4cdf2df58594843eb6f5dd3ac4bdd0cbcc87..946c460a70e9ebfb47d48d31a1b2d853eac7c0a3 100644 (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__ */
index 35bb2fdf0e8e432ffed247867026d67085a848ac..ca33a5b275c4208d8922c2362bdbc343d2311388 100644 (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__ */
index 7b44a23f05bc33146d9835a1883ba947f6cb6842..e1a0cfaa3f5f22553f3789be8e3287fa8ba23362 100644 (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__ */
index 720517380ce7b5e787ab3e316128c521e85f275e..68335ee887a34b65662a64a985d365c94a066c52 100644 (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__ */
index e74d5ebaa426c0827ea4ee90a173678ec75618ec..32b6e50b09a0f2e06593627edc39138fa839ed6e 100644 (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__ */
index e73915dbda72a2e0a6fd2e5350b5c642ba14aaae..5d300ef6db51e083646fbfde120af8c2fc620e0b 100644 (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);
 
index 6b770fc0c1655144e8cf39df3fd6990b720b8e68..3446d1609d98ea2ab4fe8ff12522554e0c3d942b 100644 (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__ */
index 91c7803346d446c9a7be787033dbebdfe07e5b3d..83da05ac43571491dffe8f143662ecf8d1d230d7 100644 (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__ */
index 83be2b35a003d66f3b2b47749b416a1dbdea4e68..2f65fd54be241c561046ee2fa51a4874045781aa 100644 (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__ */
index 8b7c439951600c83491181af6c91e4d679e59112..ccdcb1babd2f4b009433cd57efc42010d596bc25 100644 (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__ */
index b33b6e3597b0b024bb95362459fe7e027d60b643..94f1c283af71a20e751bf081627e843e0133318d 100644 (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__ */
index b181650e9289824cbdccd4314d63f4f9cb7fce2b..abdd01c7a1d5b08020b02d857583f67c6c7af8a1 100644 (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__ */
index 6d8074b71307e4829f2c124492d567c704737532..097a56f22eb445ecd9129fac272691c9755ec85b 100644 (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__ */
index f788dbcd0ff1c33b54254c94a51dcdb2582f229f..060dff69f52d30961ba2c6fd93c8bee7ca482f8a 100644 (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__ */
index b080e025d16646f98d2706123b72f28b53e541b0..4f3453675c7c72c4629c32a2e98a80807d4a477e 100644 (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__ */
index ba0c6ae8c6165ae04127ed68b009ce357a37a212..98c7f23c28887af42108b842d3363f95cfe4c786 100644 (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__ */
index f6e474d6702fbdafe9e735d1db702b1a1e77dd1f..4209d69ee730316ea38530207fe36a7b21c357ca 100644 (file)
@@ -49,4 +49,4 @@ CCL_NAMESPACE_BEGIN
 
 CCL_NAMESPACE_END
 
-#endif /* __FILTER_H__ */
+#endif  /* __FILTER_H__ */
index 1a2f22a698709abb35d8fb654e67e22fc05185ea..67f4e62ac0f610df158146fcc19cf9a16298c237 100644 (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__*/
index 5901429918c5e749843b1e709ac548e391e6008d..b6b58b52a292950116c5bf3f115dbb9b95ecc21b 100644 (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;
                                }
 
index 00ce89ae5672e40ab5104f50c46be87849117f10..8c0d0a9770eb0b2d119b0b5fc321d3e1ab9d30f9 100644 (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);
index aa6b102a0f31733cab77336e80cae6111a008e7c..6b4fbcbbb7c0c1a23cfb5655072309a37ee4fd04 100644 (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
index 373324afb01920e314cc22e7a960e0a117cfc2ec..1c8c91d15e6b52d22f831c4db6bdbe09f60f7ef8 100644 (file)
@@ -63,4 +63,4 @@ void kernel_tex_copy(KernelGlobals *kg,
 
 CCL_NAMESPACE_END
 
-#endif /* __KERNEL_H__ */
+#endif  /* __KERNEL_H__ */
index 990e798543a59f63f0a8654f43915659d00e8f97..ea478a8a5d3ffef2b608a2e4c5f0353f103b0839 100644 (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__ */
index aa7a16afa1d403ff19d19ca999c06dffe9101a8f..4ee80850402faccd371acc8f38dcad814cd96fd4 100644 (file)
@@ -153,4 +153,4 @@ typedef vector3<avxf> avx3f;
 
 CCL_NAMESPACE_END
 
-#endif /* __KERNEL_COMPAT_CPU_H__ */
+#endif  /* __KERNEL_COMPAT_CPU_H__ */
index ac63bcf7ac9657a1398cb0dc83ec0dc482c748fe..8ed96bbae642400dc139211ecc00d9fd15f7dbf7 100644 (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__ */
index 3f7e264fbee77b559a1d3494bda489269d101281..21a9509889407d18c25bde05b7434c295824c44b 100644 (file)
 #include "util/util_half.h"
 #include "util/util_types.h"
 
-#endif /* __KERNEL_COMPAT_OPENCL_H__ */
+#endif  /* __KERNEL_COMPAT_OPENCL_H__ */
index 486c61d2ae5f08825dd4e3f5088917a9cfaede65..ee3b8b8abfb7686502c60405f1ca0cd057a5afda 100644 (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__ */
        }
 }
 
index 96391db7649eb0115d34a097fa02708603b20162..a8a43f3ea4a5b808d49efce83dc748aaa5435283 100644 (file)
@@ -25,4 +25,4 @@
 #include "util/util_texture.h"
 #include "util/util_transform.h"
 
-#endif /* __KERNEL_MATH_H__ */
+#endif  /* __KERNEL_MATH_H__ */
index ce68aa16af868e913d24776807771fe6e00314b9..dde93844dd3b9ae6bed54b630e06175a9b3058bf 100644 (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__ */
index e256a1819ed6f3e3efbacb4f8c4507829a3c7403..80477f921ead263f58c741a02caa43d2deb88157 100644 (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;
 }
index 5745762e1836ffc4fae2196d6db6a9de61f01d45..cb1f410b09f031a793ac830bc3cb83ce77bc4aa2 100644 (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) {
index feaea15d3c4c8e40aa297421d268122cdef069d6..d2506fc1e7eefdf79568a6c11bdbaf5674a3c159 100644 (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
index e32d4bbbc1b423154aa5a19fc50fa020709b1173..de8cc4a0cef0d170a076aca989549013c239a49b 100644 (file)
@@ -145,4 +145,4 @@ ccl_device int dequeue_ray_index(
 
 CCL_NAMESPACE_END
 
-#endif // __KERNEL_QUEUE_H__
+#endif  // __KERNEL_QUEUE_H__
index b33e4eba8a42e8cec5b7e77545bd88fde9de1dfb..61ddf4a4f81a655a22cba8508741cae1c5c290b5 100644 (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,
index 8a0da6c3b13ba6ee6207fe62afc462e0325b388c..fafa3ad4bfa0ea935f464da8f1e7fd6098c24971 100644 (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,
index 14d5ff29bd878560f03a2427509fe6219b6704e9..864aa7c470a8597a168713fde523062ab5249e84 100644 (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__ */
index d71761a97bcacccb1f1553e9975798868d062a00..d6d283c42c5a4ab05d79fda6337d3c34a16c99b0 100644 (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
index b77b7350d86b1baf1d77599104351e2449e57e86..0a7b765c3a2e0499ba734d40156ce1fbcd9c9b70 100644 (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__
index 5ec1655ab056efa95f98eb8aa1e9cda1a49100e0..759b7e4c20d47358c78334ae7412b98e44d1eb0e 100644 (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)
index d9aeb9ab9fb207b9740d9c55324ca270331bd9c3..2a50704b569430fb4caaded4ec9af87b843ee0d6 100644 (file)
@@ -146,4 +146,4 @@ CCLOSURE_PREPARE_STATIC(bsdf_##lower##_prepare, Upper##Closure)
 
 CCL_NAMESPACE_END
 
-#endif /* __OSL_CLOSURES_H__ */
+#endif  /* __OSL_CLOSURES_H__ */
index 30b29793e2dd3b45b18ebcd345fe980f7ad44f47..88192fbcccb95d7eaa6358c37d96e79581c0f806 100644 (file)
@@ -94,4 +94,4 @@ CCL_NAMESPACE_END
 
 #endif
 
-#endif /* __OSL_GLOBALS_H__ */
+#endif  /* __OSL_GLOBALS_H__ */
index 5dcaa4d74454af572175b699d72ef3f17012ae18..712b06b41b8fb139a171014fb29b978f0b647000 100644 (file)
@@ -199,4 +199,4 @@ private:
 
 CCL_NAMESPACE_END
 
-#endif /* __OSL_SERVICES_H__  */
+#endif  /* __OSL_SERVICES_H__  */
index 571a3f502be6222e6998dfb1b6ee04b36999b5d2..9824f966a4416fc2d2dd4b660bd675dbeac102c6 100644 (file)
@@ -66,4 +66,4 @@ CCL_NAMESPACE_END
 
 #endif
 
-#endif /* __OSL_SHADER_H__ */
+#endif  /* __OSL_SHADER_H__ */
index 141e5d27e3ad40e081ebcef07f6b43046ef221de..592a8ad12d99a9a209703ce3c099957fef45efff 100644 (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 */
index f1235500f2b54adeb0ad1a738068ef2cc028356d..7136c7463217688197c041b035aaf3068f1e2363 100644 (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 */
index 2132c42220fc47b17e80285d488e0c5aee4707e5..666355de334257ba770c09d1cb6e5fd782ee0493 100644 (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
index 56194d9f857fd094446ba2bc6743038022a1a072..83df1e2a0a6531389fad62f6e2db21eb9c4d8686 100644 (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) \
index ab69afa051e9e5df9adeccf379e136ce947ee9a2..ccb9aef7a5bd96aca998d0879ee3e6eefcf6a374 100644 (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__ */
index 64bf8244999d6eba7c75e1b85d9cdb500f7ed398..e834d75c51356c27cb3e59e6d9a5e873f8950629 100644 (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);
                                        }
                                }
index 27127b85323e0259e9f717d43c3c750b61e94a4c..41538d1138dd780cf4d63f9cad811d896e99be11 100644 (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__ */
index a3e4b6e87cdd462a7db8d94c5886867934ba6a44..6f39391057e43759e058b0adcaf708bc88cf599b 100644 (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__ */
index a67689ff9d1b7d8f211ead1c3866617d99c21ff6..847108ff1c2bb238be19e348e4b4ade69293e29c 100644 (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__ */
index 910537a2539fc90675f82388ba3b386336a63c8a..0f1dfa4936b92c280aacd2efc43e838b5f06896e 100644 (file)
@@ -531,4 +531,4 @@ typedef enum ClosureType {
 
 CCL_NAMESPACE_END
 
-#endif /*  __SVM_TYPES_H__ */
+#endif  /*  __SVM_TYPES_H__ */
index 7b60ab6e6aecc8bbb7cd7c067fb26128542e5267..80b63dc80cdd2ab544e5d11ff068c1332af3932e 100644 (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)
index 40e5be2e1b2e0a51234b0d92dba10c968b436378..e7438f4513d14e69f66049699886e844839b70f3 100644 (file)
@@ -172,4 +172,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __ATTRIBUTE_H__ */
+#endif  /* __ATTRIBUTE_H__ */
index 3f56dedb2c8fca9293975b3c0e84838da714f3ce..17c3eaaaaf5dea066c69449af1f5accb8fc182ed 100644 (file)
@@ -59,4 +59,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __BACKGROUND_H__ */
+#endif  /* __BACKGROUND_H__ */
index a811eac3327ab5f1ea7a1f5d7db346b3d9264e0d..fce8f2fa6064387bb6cb0fab5002fa9769148124 100644 (file)
@@ -83,4 +83,4 @@ private:
 
 CCL_NAMESPACE_END
 
-#endif /* __BAKE_H__ */
+#endif  /* __BAKE_H__ */
index a8f019dddd6537b5fe814af9abd63ac7584f50f0..46c3b89bd842338b83aa923fd9fdbfe2f4f693cb 100644 (file)
@@ -146,4 +146,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __BUFFERS_H__ */
+#endif  /* __BUFFERS_H__ */
index 323f2c61ca4df0ffee74f670bde153a539cb4801..9f0830d7a54e930e31245fb018d3ac6abcaa2037 100644 (file)
@@ -212,4 +212,4 @@ private:
 
 CCL_NAMESPACE_END
 
-#endif /* __CAMERA_H__ */
+#endif  /* __CAMERA_H__ */
index 26fa4e8b1c89b26a7bfbae19773a9271e27ed6bf..6ec94b055e3ebac17c0c29cd725da0897d76112f 100644 (file)
@@ -70,4 +70,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __CONSTANT_FOLD_H__ */
+#endif  /* __CONSTANT_FOLD_H__ */
index 16176ce4bebffab0e427e5beb4af775a363094a6..9ee0bce7517c75cdb97df81f92e4a6bdd617898c 100644 (file)
@@ -46,4 +46,4 @@ private:
 
 CCL_NAMESPACE_END
 
-#endif /* __COVERAGE_H__ */
+#endif  /* __COVERAGE_H__ */
index 62066d8a8098f0e54c17b9e86d1156fbf9b14fea..3d8611ca7147b8f1318d98a7b4780bf8446bb548 100644 (file)
@@ -119,4 +119,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __CURVES_H__ */
+#endif  /* __CURVES_H__ */
index 57f1bf4eb64c83abaa1c88ded8b26b74401fd03f..c597db4e4c5406d19b52f1ba2a9797c6edee5308 100644 (file)
@@ -95,4 +95,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __FILM_H__ */
+#endif  /* __FILM_H__ */
index 426522066b30dd9a58b2a1ce098aadd0536f09dd..d14a59b490000f69ca8fd45b6ae0f14e7ff669ac 100644 (file)
@@ -293,4 +293,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __GRAPH_H__ */
+#endif  /* __GRAPH_H__ */
index d94ebe564e35853a3dda6ffd23ddbf8c2a1c9ed7..8367a6811bd5c65a456fe19e150532f85109f2cf 100644 (file)
@@ -164,4 +164,4 @@ private:
 
 CCL_NAMESPACE_END
 
-#endif /* __IMAGE_H__ */
+#endif  /* __IMAGE_H__ */
index f68400ac416facbc4128e073f2423f9ec5c09fdc..6a7e20568519d3878280a7f8bfc534e5829547aa 100644 (file)
@@ -94,4 +94,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __INTEGRATOR_H__ */
+#endif  /* __INTEGRATOR_H__ */
index 32a911dc256059c6d8c054b9a34b199caa8e1c0c..f4dfe0cadbf69667d438a045f19ddc4636f9658d 100644 (file)
@@ -139,4 +139,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __LIGHT_H__ */
+#endif  /* __LIGHT_H__ */
index 444f03a3664ca041b585f7b558b5f7bb1deea0a4..8a6629e38f8625e29f02cab4372d564d022fb001 100644 (file)
@@ -390,4 +390,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __MESH_H__ */
+#endif  /* __MESH_H__ */
index 28bbe2de05ae998ccf3690a1fafa1a8312ef3831..154ae31551c7df72e03d14f0ce0a99f51adcaf40 100644 (file)
@@ -1161,4 +1161,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __NODES_H__ */
+#endif  /* __NODES_H__ */
index 288c3f5457af29a6a01ecd2e1fb792156b761400..285362f7ec406cdaebd157ad217407c9d47e6102 100644 (file)
@@ -132,4 +132,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __OBJECT_H__ */
+#endif  /* __OBJECT_H__ */
index 496e9d9491a2083b4264364a8c11aa77a5eda3c3..3fbc7d33a74cea4a781d55036cbc4b45497d55cf 100644 (file)
@@ -1255,6 +1255,6 @@ void OSLCompiler::parameter_color_array(const char * /*name*/, const array<float
 {
 }
 
-#endif /* WITH_OSL */
+#endif  /* WITH_OSL */
 
 CCL_NAMESPACE_END
index 966fc1965d76900962568db77f87fe8e9f57cf03..d0542d1ae9292806ca2b1c2379589d4b778ef641 100644 (file)
@@ -171,4 +171,4 @@ private:
 
 CCL_NAMESPACE_END
 
-#endif /* __OSL_H__  */
+#endif  /* __OSL_H__  */
index 7e7afd5d054b0fcb5b1aa3b4bbd44b02906999db..3a744c9c73f644e8dd6160f29a5bb4c0bb6f9ba6 100644 (file)
@@ -68,4 +68,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __PARTICLES_H__ */
+#endif  /* __PARTICLES_H__ */
index 543feedf72fa2a4d27645399838230f9daf17296..57ea1d471e8598574afb0410d146073df037ce93 100644 (file)
@@ -268,4 +268,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /*  __SCENE_H__ */
+#endif  /*  __SCENE_H__ */
index d2ec13ada1fd00b641d80ae9b65605b1a80aacac..56a69919a7a80be4c382c3f93a7b3993aeb5d30c 100644 (file)
@@ -238,4 +238,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __SESSION_H__ */
+#endif  /* __SESSION_H__ */
index 8073138404853c736892fde2f999dd7fe1c17e0a..4c7b2fd433bea1cad5ea687ac0c0a5b812c9560d 100644 (file)
@@ -224,4 +224,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __SHADER_H__ */
+#endif  /* __SHADER_H__ */
index d38857d2b3512d134384093615543e7838c5ad35..ce7a28587f242f791573687e93f5919f3a31ae29 100644 (file)
@@ -28,4 +28,4 @@ void sobol_generate_direction_vectors(uint vectors[][SOBOL_BITS], int dimensions
 
 CCL_NAMESPACE_END
 
-#endif /* __SOBOL_H__ */
+#endif  /* __SOBOL_H__ */
index 72d5f1dd93d6683df2690b1c232d520b759240a0..2ff0ec3e0e95004f3c38997ce8d5e1ebb41c8a30 100644 (file)
@@ -101,4 +101,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __RENDER_STATS_H__ */
+#endif  /* __RENDER_STATS_H__ */
index 44b7eeec6db40b3aa1145cbc197d33d581771d4a..b380117e729c185de2806e8bb57e61ec271f3013 100644 (file)
@@ -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);
                }
        }
index 1d0613bbfdc2314ab523e827fad8ef3fa36f452d..6a1f24462fb7d17848216c99b0f7bf48b6949a21 100644 (file)
@@ -223,4 +223,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __SVM_H__ */
+#endif  /* __SVM_H__ */
index 09d961a9c3c2a843908557dc9f919145faf9f0cb..709333cb1b623e73fe2d57bfbfc66011b1b34315 100644 (file)
@@ -50,4 +50,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __TABLES_H__ */
+#endif  /* __TABLES_H__ */
index f72f653f4c25a5c2926531aeed6bae68c787d3e1..2835c79307328ba381a9ba36784ba4e8c1f84425 100644 (file)
@@ -154,4 +154,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __TILE_H__ */
+#endif  /* __TILE_H__ */
index 4617c782b3ad4a22c83362b7eb30bf8a97e4bed2..2bef8d4cf8d2fcff0abdfe105261410899b23bc0 100644 (file)
@@ -134,4 +134,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __SUBD_DICE_H__ */
+#endif  /* __SUBD_DICE_H__ */
index 64ec8f709511cd6f5afcaf515110cff98040280f..84100139f2c4705b6a23bdbc37636585f005e165 100644 (file)
@@ -56,4 +56,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __SUBD_PATCH_H__ */
+#endif  /* __SUBD_PATCH_H__ */
index 45be7051992e6a9f7446393045a00c915b4bdded..d96a43adfb9cdeee7d4085dcaf86a3af43b18ec9 100644 (file)
@@ -59,4 +59,4 @@ struct PackedPatchTable {
 
 CCL_NAMESPACE_END
 
-#endif /* __SUBD_PATCH_TABLE_H__ */
+#endif  /* __SUBD_PATCH_TABLE_H__ */
index 7a276b353824f0f6a7de3fffbc0741e3d56ff5ec..3368c93944b86882de6cd1a1ef48dac1ee2ec9ca 100644 (file)
@@ -56,4 +56,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __SUBD_SPLIT_H__ */
+#endif  /* __SUBD_SPLIT_H__ */
index c2f400c105d1da9e2dcbcfa802717849e774136f..1df568493d86bfa7ce0dff318a2c5ee36daed469 100644 (file)
@@ -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
index eb874713d43982a1893c4f834d93f212f741efed..f9e6476cc52ade8dcab78efdb25f893c4fc6fa9b 100644 (file)
@@ -29,4 +29,4 @@ using std::remove;
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_ALGORITHM_H__ */
+#endif  /* __UTIL_ALGORITHM_H__ */
index be6f2c2b9f11956c01ed4c0ed75ad664c90c8587..9fe54b14d77357fc8da5545f8104ffea68fd3ac7 100644 (file)
@@ -28,4 +28,4 @@ OIIO_NAMESPACE_USING
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_ARGS_H__ */
+#endif  /* __UTIL_ARGS_H__ */
index e17e99d0acd981297d9558d6a7a32ba26e3a373e..b13963003292c0c0ef5b22f91ff358ebfcc52884 100644 (file)
@@ -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__ */
index b1bd5be0df34807e0cad6cf05d695962f19d594b..fe89e398840b890ae13504f5ceac530bf86ac1b1 100644 (file)
@@ -282,4 +282,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_BOUNDBOX_H__ */
+#endif  /* __UTIL_BOUNDBOX_H__ */
index 826db469d251c9e3c23051921844e9d3eac402d0..e6efc7d73fcd5b6e5fae94abcd2c7fb96d1143e1 100644 (file)
@@ -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__ */
index f17f8a560ee41dc736efa43cdd8677aa2ac8bc24..864089bb1180b1c1956e81df0c8239af6f2b7837 100644 (file)
@@ -182,4 +182,4 @@ std::ostream& operator <<(std::ostream &os,
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_DEBUG_H__ */
+#endif  /* __UTIL_DEBUG_H__ */
index 8bce4aca69991bd1769a33d49f52f6992c20077e..29eab4bbc6af95ccc4b0515aed7ade8d4cfc8324 100644 (file)
@@ -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__ */
index 2a74ff0a55d77a9aa0846db4f1f66fa1fb2ffb75..fd106d58b431dd1f704322355e65c0785bd848ee 100644 (file)
@@ -21,4 +21,4 @@
 
 #define foreach(x, y) for(x : y)
 
-#endif /* __UTIL_FOREACH_H__ */
+#endif  /* __UTIL_FOREACH_H__ */
index f3cc00329adeb05cc1118babd2bdc4f3437ff33b..72c7ce43073de74aa0d0706c3813cc06afae7129 100644 (file)
@@ -36,4 +36,4 @@ using std::placeholders::_9;
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_FUNCTION_H__ */
+#endif  /* __UTIL_FUNCTION_H__ */
index 53b7f2472bdad0e264410eefe323e9b47d0a664e..3868509c21b437cb8c0480e34c7a34f5d6e932a2 100644 (file)
@@ -148,4 +148,4 @@ ccl_device_inline half float_to_half(float f)
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_HALF_H__ */
+#endif  /* __UTIL_HALF_H__ */
index a8a5076fbb35a982762386f7ed463db78b7bc44a..f343252eacad9995169e35bbb094ea7eaacc709e 100644 (file)
@@ -68,4 +68,4 @@ ccl_device_inline float hash_int_01(uint k)
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_HASH_H__ */
+#endif  /* __UTIL_HASH_H__ */
index 5933cb3962a3081601e76dae06e7a48d9b1b2fc3..663ad649a9c37f00184a1dfd6189074fd9d14c46 100644 (file)
@@ -58,4 +58,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_IES_H__ */
+#endif  /* __UTIL_IES_H__ */
index 85bdb0d80505b2e128962b34f5c29bebcd7cd285..da5f56271c843a68ba57ec7d00c09cdef7f1fa7c 100644 (file)
@@ -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"
index f555b001186b05c770cd22998618a4726f3a9dac..fcf8e4f5c74bb4ebfbf5be553f92925eb2e415df 100644 (file)
@@ -25,4 +25,4 @@ using std::list;
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_LIST_H__ */
+#endif  /* __UTIL_LIST_H__ */
index 5c84b6593d3b0153f1c5e145faa832e457e16aba..4a5c3cd15bfa9d0c9606790dec880ab2c39352c6 100644 (file)
@@ -62,4 +62,4 @@ std::ostream& operator <<(std::ostream &os,
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_LOGGING_H__ */
+#endif  /* __UTIL_LOGGING_H__ */
index 3c9288417cf2d3817ba9a1ede7cdff01cff28838..1952d33ada8be13544a74aa27047965c6336e7b6 100644 (file)
@@ -28,4 +28,4 @@ using std::unordered_map;
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_MAP_H__ */
+#endif  /* __UTIL_MAP_H__ */
index eafae5f31c0304cd280b2bd0a6ca52242b71d707..6167119f873bc17e9e26bc485b5fa078eed490f1 100644 (file)
@@ -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__ */
index 79643fe26e3f559d5f4e5e8cd43622764ce70ce4..983855e3e9b9183a2b4cced524258eda91da3027 100644 (file)
@@ -75,4 +75,4 @@ void util_cdf_inverted(const int resolution,
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_MATH_H_CDF__ */
+#endif  /* __UTIL_MATH_H_CDF__ */
index 6f9d0855d50333a2e1857b547f8bc2f7a1ca7590..e937509367f0c45459307f7e2e9decde9203d74f 100644 (file)
@@ -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__ */
index 75265c1c9a2298c1d3dc7e8fb5cf289bff41bbb0..a54a3f3087c89311c3a29b14d2f39a9376fb0a07 100644 (file)
@@ -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__ */
index 105547098b5d721d6cdb7c7a58c37763622b76af..479ccf202ba1211f62617774749e5de9653318ce 100644 (file)
@@ -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__ */
index 828c49a131c8b3e86378ddfb77cf10b9479ec126..dd401d9a091fcb1d2c241f2f7fa18678eb1dfb0a 100644 (file)
@@ -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__ */
index 81b10f31f4a808c5abb96e96c5d15a3d2021b000..2f4752f90f14467c796f5273f81e48acf944f5f9 100644 (file)
@@ -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__ */
index cde366b8c27b07622ac432be665e55def8ff3ab0..763c42318d54661ed990a7a2d23ea092dbe6c52c 100644 (file)
@@ -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__ */
index b5fbb24091fcacff93d2a66a108c77e191f98b22..190c2f5d6b0a1b65f06c3765bc9a3288dbb64cc4 100644 (file)
@@ -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__ */
index 9023ccee4c2c1bba6cae3eb06022541185c79b22..f8c0115d8cee02e917b72cb1c7ee1b9f3c4e87ef 100644 (file)
@@ -58,4 +58,4 @@ string util_md5_string(const string& str);
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_MD5_H__ */
+#endif  /* __UTIL_MD5_H__ */
index 824ed59cb16a6dd91b14452e755c1cd4c86fb21e..3e7897d3ae6f4bdd5c7a86a89668f9d2302d5e4e 100644 (file)
@@ -27,4 +27,4 @@ float util_hash_to_float(uint32_t hash);
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_MURMURHASH_H__ */
+#endif  /* __UTIL_MURMURHASH_H__ */
index 0b5462e0a09403469c14eb3e2649041cb4ef7bf9..2ca7b7e4c872c44e7533154bd982c694c8c23daf 100644 (file)
@@ -28,4 +28,4 @@
 #  define mxMakeCurrentContext(x) (x)
 #endif
 
-#endif /* __UTIL_OPENGL_H__ */
+#endif  /* __UTIL_OPENGL_H__ */
index 3b3627242d5f2f3f25fe5a88fe1821665474e34e..5267bd9a97ada6adb032490f2ceb4ea114e6e334 100644 (file)
@@ -68,4 +68,4 @@
 
 #endif
 
-#endif /* __UTIL_OPTIMIZATION_H__ */
+#endif  /* __UTIL_OPTIMIZATION_H__ */
index 246b5cb7d637164b9d29e650c3aeb0b933521404..4453c66aae2ec628f34540203714a992892354a9 100644 (file)
@@ -30,4 +30,4 @@ OIIO_NAMESPACE_USING
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_PARAM_H__ */
+#endif  /* __UTIL_PARAM_H__ */
index 51b7944705e26ec66c17322e4244462ea247d554..93080a6c80cd34dba878f06419b83dc239eb47d1 100644 (file)
@@ -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)
index 3ef15c5c09a697dea92c69a5cb90a76f3d7f013c..453af7de36b781cc3ae0d351dad6d8b072f8b2a9 100644 (file)
@@ -365,4 +365,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_PROGRESS_H__ */
+#endif  /* __UTIL_PROGRESS_H__ */
index 26b4843928cc1495966f63cd8a80c2eb391960b1..d1af013ae3a688fd43da3838c105f4bf1256fd83 100644 (file)
@@ -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__ */
index 622f4fe3e470e1c648f6838d02b0871edea598df..0a2b7718f57112df010a7476e7e246f048d55245 100644 (file)
@@ -25,4 +25,4 @@ using std::queue;
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_LIST_H__ */
+#endif  /* __UTIL_LIST_H__ */
index d13baefe85e3e478255a865df99826a042f126b0..389669acf2efdcc62ba4418529b8ad6cc1172d11 100644 (file)
@@ -69,4 +69,4 @@ ccl_device_inline int rect_size(int4 rect)
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_RECT_H__ */
+#endif  /* __UTIL_RECT_H__ */
index 298e1f7729a6d1e1b6ceb3f51c3d65b38e8554fb..a9c56bb491975f0255d9f4a8b16b92d11150631d 100644 (file)
@@ -31,4 +31,4 @@ using std::unordered_set;
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_SET_H__ */
+#endif  /* __UTIL_SET_H__ */
index cc7f436c8fe0fe799fefeb47d07cad28004cc983..565ea768089bf54fd1e6d4e5f12df72cc4ccb389 100644 (file)
@@ -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__ */
index 237e4e61bf536a00b1156eac762e25c3d0d596a8..2e593f58c395004e0c5d4308b05f21fdeb0da883 100644 (file)
@@ -437,6 +437,6 @@ double arhosekskymodel_solar_radiance(ArHosekSkyModelState* state,
                                       double wavelength);
 
 
-#endif // _SKY_MODEL_H_
+#endif  // _SKY_MODEL_H_
 
 CCL_NAMESPACE_END
index dc3cb3f6ecc78c91edec88cd098397f251e35261..b1c6c37469394680bfc2d53c0fc360def269b70f 100644 (file)
@@ -47,4 +47,4 @@ CCL_NAMESPACE_BEGIN
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_STATIC_ASSERT_H__ */
+#endif  /* __UTIL_STATIC_ASSERT_H__ */
index 7667f58eb7d3da070da62454d4604b2d4a409b57..0ba58422a6778ef0573a44c6d52a7c62d52dd1cc 100644 (file)
@@ -44,4 +44,4 @@ public:
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_STATS_H__ */
+#endif  /* __UTIL_STATS_H__ */
index 3a4f4398158f11e81f58fc709d6611ef38dc1f9d..f17112c30d23212a1ce52a269abb3a0e6b0068cb 100644 (file)
@@ -74,4 +74,4 @@ string string_human_readable_number(size_t num);
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_STRING_H__ */
+#endif  /* __UTIL_STRING_H__ */
index 42ad72356b9978681962357626b3a0f70c3ee691..241ac89715748499ff5f2b5e124140efba5e1dc0 100644 (file)
@@ -46,4 +46,4 @@ size_t system_physical_ram();
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_SYSTEM_H__ */
+#endif  /* __UTIL_SYSTEM_H__ */
index f752e81128d5d009906804ba3adbfded96804cb2..233cfe33305e03d9b90c9edd2dd9f8c693495d4e 100644 (file)
@@ -89,4 +89,4 @@ typedef struct TextureInfo {
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_TEXTURE_H__ */
+#endif  /* __UTIL_TEXTURE_H__ */
index f39fcfb4279b0b12d50338d1d5a9d96ecb0b4c5e..f7d2d452d8914a6c37616faf40db7b4e008844f7 100644 (file)
@@ -138,4 +138,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_THREAD_H__ */
+#endif  /* __UTIL_THREAD_H__ */
index 6bdf56fda7fee0bf5cf976f7400cf7affe3d7560..e4cadd3e81ae91822ae24e55fe02f22737955c5b 100644 (file)
@@ -495,4 +495,4 @@ OPENCL_TRANSFORM_ADDRSPACE_DECLARE(transform_direction_transposed)
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_TRANSFORM_H__ */
+#endif  /* __UTIL_TRANSFORM_H__ */
index 96c549b9be50299bd691bc143f5f00a4de73bec3..535048d8f8ce036c7f8170ed7f54be9f87b8945c 100644 (file)
@@ -156,4 +156,4 @@ CCL_NAMESPACE_END
 #endif
 #endif
 
-#endif /* __UTIL_TYPES_H__ */
+#endif  /* __UTIL_TYPES_H__ */
index 0b33221ad4de5d12ff86581a085049d3dd9076fb..977019994bec8ad62d3a660ea1f25a92301d6501 100644 (file)
@@ -336,4 +336,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_VECTOR_H__ */
+#endif  /* __UTIL_VECTOR_H__ */
index 112255f447bde1a45715161d8e35eb0dfdf8dfc3..980c5a269e64fb2ef1fa8f9b49779aa43f5df61d 100644 (file)
@@ -34,4 +34,4 @@ CCL_NAMESPACE_BEGIN
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_VERSION_H__ */
+#endif  /* __UTIL_VERSION_H__ */
index e603e605776c6eb2459021bda74c4b28af0d78d4..a757b56a5d22c3b1894bc02f34a9fea0812f9fa8 100644 (file)
@@ -40,4 +40,4 @@ void view_redraw();
 
 CCL_NAMESPACE_END
 
-#endif /*__UTIL_VIEW_H__*/
+#endif  /*__UTIL_VIEW_H__*/
index 3b23ce8a3cb22d73a97bd9bfc311276e4517a7ce..9b9268fed7a9c2f641cd86c9f94576e08b7d041a 100644 (file)
@@ -56,4 +56,4 @@ CCL_NAMESPACE_END
 
 #endif  /* WIN32 */
 
-#endif /* __UTIL_WINDOWS_H__ */
+#endif  /* __UTIL_WINDOWS_H__ */
index 6f06f17937b4ad661c841794b0ff0d697436d00a..c8a3a495f308fb6420bb75bdc318e3b8d6818567 100644 (file)
@@ -38,4 +38,4 @@ using PUGIXML_NAMESPACE::xml_parse_result;
 
 CCL_NAMESPACE_END
 
-#endif /* __UTIL_XML_H__ */
+#endif  /* __UTIL_XML_H__ */