Commit: cb4b5e12abf1fc6cf9ffc0944e0a1bc406286c63 Author: Sergey Sharybin Date: Fri Nov 9 11:34:54 2018 +0100 Branches: master https://developer.blender.org/rBcb4b5e12abf1fc6cf9ffc0944e0a1bc406286c63
Cycles: Cleanup, spacing after preprocessor It is supposed to be two spaces before comment stating which if else/endif statements corresponds to. Was mainly violated in the header guards. =================================================================== M intern/cycles/app/cycles_xml.h M intern/cycles/blender/CCL_api.h M intern/cycles/blender/blender_object_cull.h M intern/cycles/blender/blender_python.cpp M intern/cycles/blender/blender_session.h M intern/cycles/blender/blender_sync.h M intern/cycles/blender/blender_util.h M intern/cycles/bvh/bvh.h M intern/cycles/bvh/bvh2.h M intern/cycles/bvh/bvh4.h M intern/cycles/bvh/bvh8.h M intern/cycles/bvh/bvh_build.h M intern/cycles/bvh/bvh_embree.cpp M intern/cycles/bvh/bvh_embree.h M intern/cycles/bvh/bvh_node.h M intern/cycles/bvh/bvh_params.h M intern/cycles/bvh/bvh_sort.h M intern/cycles/bvh/bvh_split.h M intern/cycles/bvh/bvh_unaligned.h M intern/cycles/device/device.h M intern/cycles/device/device_cpu.cpp M intern/cycles/device/device_cuda.cpp M intern/cycles/device/device_denoising.h M intern/cycles/device/device_intern.h M intern/cycles/device/device_memory.h M intern/cycles/device/device_network.h M intern/cycles/device/device_opencl.cpp M intern/cycles/device/device_split_kernel.h M intern/cycles/device/device_task.h M intern/cycles/device/opencl/opencl_split.cpp M intern/cycles/kernel/bvh/bvh.h M intern/cycles/kernel/bvh/bvh_local.h M intern/cycles/kernel/bvh/bvh_shadow_all.h M intern/cycles/kernel/bvh/bvh_traversal.h M intern/cycles/kernel/bvh/bvh_volume.h M intern/cycles/kernel/bvh/bvh_volume_all.h M intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h M intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h M intern/cycles/kernel/closure/bsdf_diffuse.h M intern/cycles/kernel/closure/bsdf_diffuse_ramp.h M intern/cycles/kernel/closure/bsdf_hair.h M intern/cycles/kernel/closure/bsdf_hair_principled.h M intern/cycles/kernel/closure/bsdf_microfacet.h M intern/cycles/kernel/closure/bsdf_microfacet_multi_impl.h M intern/cycles/kernel/closure/bsdf_oren_nayar.h M intern/cycles/kernel/closure/bsdf_phong_ramp.h M intern/cycles/kernel/closure/bsdf_principled_diffuse.h M intern/cycles/kernel/closure/bsdf_principled_sheen.h M intern/cycles/kernel/closure/bsdf_reflection.h M intern/cycles/kernel/closure/bsdf_refraction.h M intern/cycles/kernel/closure/bsdf_toon.h M intern/cycles/kernel/closure/bsdf_transparent.h M intern/cycles/kernel/closure/bsdf_util.h M intern/cycles/kernel/closure/bssrdf.h M intern/cycles/kernel/filter/filter.h M intern/cycles/kernel/filter/filter_defines.h M intern/cycles/kernel/geom/geom_curve_intersect.h M intern/cycles/kernel/geom/geom_subd_triangle.h M intern/cycles/kernel/geom/geom_triangle_intersect.h M intern/cycles/kernel/kernel.h M intern/cycles/kernel/kernel_color.h M intern/cycles/kernel/kernel_compat_cpu.h M intern/cycles/kernel/kernel_compat_cuda.h M intern/cycles/kernel/kernel_compat_opencl.h M intern/cycles/kernel/kernel_id_passes.h M intern/cycles/kernel/kernel_math.h M intern/cycles/kernel/kernel_montecarlo.h M intern/cycles/kernel/kernel_passes.h M intern/cycles/kernel/kernel_path.h M intern/cycles/kernel/kernel_path_volume.h M intern/cycles/kernel/kernel_queues.h M intern/cycles/kernel/kernel_random.h M intern/cycles/kernel/kernel_shadow.h M intern/cycles/kernel/kernel_types.h M intern/cycles/kernel/kernel_volume.h M intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h M intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h M intern/cycles/kernel/osl/osl_closures.h M intern/cycles/kernel/osl/osl_globals.h M intern/cycles/kernel/osl/osl_services.h M intern/cycles/kernel/osl/osl_shader.h M intern/cycles/kernel/shaders/oslutil.h M intern/cycles/kernel/shaders/stdosl.h M intern/cycles/kernel/split/kernel_shader_sort.h M intern/cycles/kernel/split/kernel_split_data_types.h M intern/cycles/kernel/svm/svm.h M intern/cycles/kernel/svm/svm_closure.h M intern/cycles/kernel/svm/svm_hsv.h M intern/cycles/kernel/svm/svm_ramp.h M intern/cycles/kernel/svm/svm_ramp_util.h M intern/cycles/kernel/svm/svm_types.h M intern/cycles/kernel/svm/svm_wave.h M intern/cycles/render/attribute.h M intern/cycles/render/background.h M intern/cycles/render/bake.h M intern/cycles/render/buffers.h M intern/cycles/render/camera.h M intern/cycles/render/constant_fold.h M intern/cycles/render/coverage.h M intern/cycles/render/curves.h M intern/cycles/render/film.h M intern/cycles/render/graph.h M intern/cycles/render/image.h M intern/cycles/render/integrator.h M intern/cycles/render/light.h M intern/cycles/render/mesh.h M intern/cycles/render/nodes.h M intern/cycles/render/object.h M intern/cycles/render/osl.cpp M intern/cycles/render/osl.h M intern/cycles/render/particles.h M intern/cycles/render/scene.h M intern/cycles/render/session.h M intern/cycles/render/shader.h M intern/cycles/render/sobol.h M intern/cycles/render/stats.h M intern/cycles/render/svm.cpp M intern/cycles/render/svm.h M intern/cycles/render/tables.h M intern/cycles/render/tile.h M intern/cycles/subd/subd_dice.h M intern/cycles/subd/subd_patch.h M intern/cycles/subd/subd_patch_table.h M intern/cycles/subd/subd_split.h M intern/cycles/test/util_path_test.cpp M intern/cycles/util/util_algorithm.h M intern/cycles/util/util_args.h M intern/cycles/util/util_atomic.h M intern/cycles/util/util_boundbox.h M intern/cycles/util/util_color.h M intern/cycles/util/util_debug.h M intern/cycles/util/util_defines.h M intern/cycles/util/util_foreach.h M intern/cycles/util/util_function.h M intern/cycles/util/util_half.h M intern/cycles/util/util_hash.h M intern/cycles/util/util_ies.h M intern/cycles/util/util_image.h M intern/cycles/util/util_list.h M intern/cycles/util/util_logging.h M intern/cycles/util/util_map.h M intern/cycles/util/util_math.h M intern/cycles/util/util_math_cdf.h M intern/cycles/util/util_math_float2.h M intern/cycles/util/util_math_float3.h M intern/cycles/util/util_math_float4.h M intern/cycles/util/util_math_int2.h M intern/cycles/util/util_math_int3.h M intern/cycles/util/util_math_int4.h M intern/cycles/util/util_math_intersect.h M intern/cycles/util/util_md5.h M intern/cycles/util/util_murmurhash.h M intern/cycles/util/util_opengl.h M intern/cycles/util/util_optimization.h M intern/cycles/util/util_param.h M intern/cycles/util/util_path.cpp M intern/cycles/util/util_progress.h M intern/cycles/util/util_projection.h M intern/cycles/util/util_queue.h M intern/cycles/util/util_rect.h M intern/cycles/util/util_set.h M intern/cycles/util/util_simd.h M intern/cycles/util/util_sky_model.h M intern/cycles/util/util_static_assert.h M intern/cycles/util/util_stats.h M intern/cycles/util/util_string.h M intern/cycles/util/util_system.h M intern/cycles/util/util_texture.h M intern/cycles/util/util_thread.h M intern/cycles/util/util_transform.h M intern/cycles/util/util_types.h M intern/cycles/util/util_vector.h M intern/cycles/util/util_version.h M intern/cycles/util/util_view.h M intern/cycles/util/util_windows.h M intern/cycles/util/util_xml.h =================================================================== diff --git a/intern/cycles/app/cycles_xml.h b/intern/cycles/app/cycles_xml.h index 6a48980d8ea..a7bc1895d4e 100644 --- a/intern/cycles/app/cycles_xml.h +++ b/intern/cycles/app/cycles_xml.h @@ -29,4 +29,4 @@ void xml_read_file(Scene *scene, const char *filepath); CCL_NAMESPACE_END -#endif /* __CYCLES_XML_H__ */ +#endif /* __CYCLES_XML_H__ */ diff --git a/intern/cycles/blender/CCL_api.h b/intern/cycles/blender/CCL_api.h index 233ffc8802c..b9750ad0c53 100644 --- a/intern/cycles/blender/CCL_api.h +++ b/intern/cycles/blender/CCL_api.h @@ -33,4 +33,4 @@ void CCL_logging_verbosity_set(int verbosity); } #endif -#endif /* __CCL_API_H__ */ +#endif /* __CCL_API_H__ */ diff --git a/intern/cycles/blender/blender_object_cull.h b/intern/cycles/blender/blender_object_cull.h index 2147877a860..6e2a22438ec 100644 --- a/intern/cycles/blender/blender_object_cull.h +++ b/intern/cycles/blender/blender_object_cull.h @@ -46,4 +46,4 @@ private: CCL_NAMESPACE_END -#endif /* __BLENDER_OBJECT_CULL_H__ */ +#endif /* __BLENDER_OBJECT_CULL_H__ */ diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 997176f9d44..8b3bec56d1f 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -839,18 +839,18 @@ void *CCL_python_module_init() #ifdef WITH_NETWORK PyModule_AddObject(mod, "with_network", Py_True); Py_INCREF(Py_True); -#else /* WITH_NETWORK */ +#else /* WITH_NETWORK */ PyModule_AddObject(mod, "with_network", Py_False); Py_INCREF(Py_False); -#endif /* WITH_NETWORK */ +#endif /* WITH_NETWORK */ #ifdef WITH_EMBREE PyModule_AddObject(mod, "with_embree", Py_True); Py_INCREF(Py_True); -#else /* WITH_EMBREE */ +#else /* WITH_EMBREE */ PyModule_AddObject(mod, "with_embree", Py_False); Py_INCREF(Py_False); -#endif /* WITH_EMBREE */ +#endif /* WITH_EMBREE */ return (void*)mod; } diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index 540fa6a8a84..82d828c5dc4 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/blender_session.h @@ -176,4 +176,4 @@ protected: CCL_NAMESPACE_END -#endif /* __BLENDER_SESSION_H__ */ +#endif /* __BLENDER_SESSION_H__ */ diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index eb84bedb118..6d78f62c7d0 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -213,4 +213,4 @@ private: CCL_NAMESPACE_END -#endif /* __BLENDER_SYNC_H__ */ +#endif /* __BLENDER_SYNC_H__ */ diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index 09ae9bea313..8f5fb5971ff 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -838,4 +838,4 @@ protected: CCL_NAMESPACE_END -#endif /* __BLENDER_UTIL_H__ */ +#endif /* __BLENDER_UTIL_H__ */ diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h index f14c8f53c80..9c290139e74 100644 --- a/intern/cycles/bvh/bvh.h +++ b/intern/cycles/bvh/bvh.h @@ -126,4 +126,4 @@ struct BVHStackEntry CCL_NAMESPACE_END -#endif /* __BVH_H__ */ +#endif /* __BVH_H__ */ diff --git a/intern/cycles/bvh/bvh2.h b/intern/cycles/bvh/bvh2.h index df65ddca5b7..ecc697567bb 100644 --- a/intern/cycles/bvh/bvh2.h +++ b/intern/cycles/bvh/bvh2.h @@ -84,4 +84,4 @@ protected: CCL_NAMESPACE_END -#endif /* __BVH2_H__ */ +#endif /* __BVH2_H__ */ diff --git a/intern/cycles/bvh/bvh4.h b/intern/cycles/bvh/bvh4.h index 310909a37e1..28bab2fe327 100644 --- a/intern/cycles/bvh/bvh4.h +++ b/intern/cycles/bvh/bvh4.h @@ -84,4 +84,4 @@ protected: CCL_NAMESPACE_END -#endif /* __BVH4_H__ */ +#endif /* __BVH4_H__ */ diff --git a/intern/cycles/bvh/bvh8.h b/intern/cycles/bvh/bvh8.h index 274a2442c7e..834daf3abce 100644 --- a/intern/cycles/bvh/bvh8.h +++ b/intern/cycles/bvh/bvh8.h @@ -95,4 +95,4 @@ protected: CCL_NAMESPACE_END -#endif /* __BVH8_H__ */ +#endif /* __BVH8_H__ */ diff --git a/intern/cycles/bvh/bvh_build.h b/intern/cycles/bvh/bvh_build.h index 7b245139819..6dae5a9e6bf 100644 --- a/intern/cycles/bvh/bvh_build.h +++ b/intern/cycles/bvh/bvh_build.h @@ -142,4 +142,4 @@ protected: CCL_NAMESPACE_END -#endif /* __BVH_BUILD_H__ */ +#endif /* __BVH_BUILD_H__ */ diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp index 87891b68c4b..7489fe8ea42 100644 --- a/intern/cycles/bvh/bvh_embree.cpp +++ b/intern/cycles/bvh/bvh_embree.cpp @@ -881,4 +881,4 @@ void BVHEmbree::refit_nodes() } CCL_NAMESPACE_END -#endif /* WITH_EMBREE */ +#endif /* WITH_EMBREE */ diff --git a/intern/cycles/bvh/bvh_embree.h b/intern/cycles/bvh/bvh_embree.h index 4b3219d575e..9990826ba98 100644 --- a/intern/cycles/bvh/bvh_embree.h +++ b/intern/cycles/bvh/bvh_embree.h @@ -74,6 +74,6 @@ private: CCL_NAMESPACE_END -#endif /* WITH_EMBREE */ +#endif /* WITH_EMBREE */ -#endif /* __BVH_EMBREE_H__ */ +#endif /* __BVH_EMBREE_H__ */ diff --git a/intern/cycles/bvh/bvh_node.h b/intern/cycles/bvh/bvh_node.h index ed89d52a50a..65d5df01158 100644 --- a/intern/cycles/bvh/bvh_node.h +++ b/intern/cycles/bvh/bvh_node.h @@ -169,4 +169,4 @@ public: CCL_NAMESPACE_END -#endif /* __BVH_NODE_H__ */ +#endif /* __BVH_NODE_H__ */ diff --git a/intern/cycles/bvh/bvh_params.h b/intern/cycles/bvh/bvh_params.h index ebede6af4a3..6408d56da80 100644 --- a/intern/cycles/bvh/bvh_params.h +++ b/intern/cycles/bvh/bvh_params.h @@ -286,4 +286,4 @@ struct BVHSpatialStorage { CCL_NAMESPACE_END -#endif /* __BVH_PARAMS_H__ */ +#endif /* __BVH_PARAMS_H__ */ diff --git a/intern/cycles/bvh/bvh_sort.h b/intern/cycles/bvh/bvh_sort.h index 936401d8607..6910cc1e9b4 100644 --- a/intern/cycles/bvh/bvh_sort.h +++ b/intern/cycles/bvh/bvh_sort.h @@ -35,4 +35,4 @@ void bvh_reference_sort(int start, CCL_NAMESPACE_END -#endif /* __BVH_SORT_H__ */ +#endif /* __BVH_SORT_H__ */ diff --git a/intern/cycles/bvh/bvh_split.h b/intern/cycles/bvh/bvh_split.h index a874a118b99..cb47deab211 100644 --- a/intern/cycles/bvh/bvh_split.h +++ b/intern/cycles/bvh/bvh_split.h @@ -259,4 +259,4 @@ public: CCL_NAMESPACE_END -#endif /* __BVH_SPLIT_H__ */ +#endif /* __BVH_SPLIT_H__ */ diff --git a/intern/cycles/bvh/bvh_unaligned.h b/intern/cycles/bvh/bvh_unaligned.h index c3ece051cd5..bcfb6ed68da 100644 --- a/intern/cycles/bvh/bvh_unaligned.h +++ b/intern/cycles/bvh/bvh_unaligned.h @@ -77,4 +77,4 @@ protected: CCL_NAMESPACE_END -#endif /* __BVH_UNALIGNED_H__ */ +#endif /* __BVH_UNALIGNED_H__ */ diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 54a3ae1fe9f..f49915bc40d 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -360,4 +360,4 @@ private: CCL_NAMESPACE_END -#endif /* __DEVICE_H__ */ +#endif /* __DEVICE_H__ */ diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 9e27a48b341..bb5e9980457 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -288,7 +288,7 @@ public: } #ifdef WITH_EMBREE bvh_layout_mask |= BVH_LAYOUT_EMBREE; -#endif /* WITH_EMBREE */ +#endif /* WITH_EMBREE */ return bvh_layout_mask; } diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index f0e58f22ad4..a52e77f707b 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -2393,7 +2393,7 @@ bool device_cuda_init(void) return result; #else /* WITH_CUDA_DYNLOAD */ return true; -#endif /* WITH_CUDA_DYNLOAD */ +#endif /* WITH_CUDA_DYNLOAD */ } Device *device_cuda_create(DeviceInfo& info, Stats &stats, bool background) diff --git a/intern/cycles/device/device_denoising.h b/intern/cycles/device/device_denoising.h index 7474f71ff78..8e0666d0e59 100644 --- a/intern/cycles/device/device_denoising.h +++ b/intern/cycles/device/device_denoising.h @@ -166,4 +166,4 @@ protected: CCL_NAMESPACE_END -#endif /* __DEVICE_DENOISING_H__ */ +#endif /* __DEVICE_DENOISING_H__ */ diff --git a/intern/cycles/device/device_intern.h b/intern/cycles/device/device_intern.h index 941be448101..d5a96c2b82b 100644 --- a/intern/cycles/device/device_intern.h +++ b/intern/cycles/device/device_intern.h @@ -40,4 +40,4 @@ string device_cuda_capabilities(void); CCL_NAMESPACE_END -#endif /* __DEVICE_INTERN_H__ */ +#endif /* __DEVICE_INTERN_H__ */ diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h index 2b4835c9c65..1801cda0de0 100644 --- a/intern/cycles/device/device_memory.h +++ b/intern/cycles/device/device_memory.h @@ -496,4 +496,4 @@ protected: CCL_NAMESPACE_END -#endif /* __DEVICE_MEMORY_H__ */ +#endif /* __DEVICE_MEMORY_H__ */ diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index 96e0de742db..67626ae177f 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -488,4 +488,4 @@ CCL_NAMESPACE_END #endif -#endif /* __DEVICE_NETWORK_H__ */ +#endif /* __DEVICE_NETWORK_H__ */ diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 0f622430abb..036f8a2e6e7 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -245,4 +245,4 @@ string device_opencl_capabilities(void) CCL_NAMESPACE_END -#endif /* WITH_OPENCL */ +#endif /* WITH_OPENCL */ diff --git a/intern/cycles/device/device_split_kernel.h b/intern/cycles/device/device_split_kernel.h index 26ddce5bb22..5af4367d1b6 100644 --- a/intern/cycles/device/device_split_kernel.h +++ b/intern/cycles/device/device_split_kernel.h @@ -130,4 +130,4 @@ public: CCL_NAMESPACE_END -#endif /* __DEVICE_SPLIT_KERNEL_H__ */ +#endif /* __DEVICE_SPLIT_KERNEL_H__ */ diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h index ec87aa8c560..db27470a03f 100644 --- a/intern/cycles/device/device_task.h +++ b/intern/cycles/device/device_task.h @@ -85,4 +85,4 @@ protected: CCL_NAMESPACE_END -#endif /* __DEVICE_TASK_H__ */ +#endif /* __DEVICE_TASK_H__ */ diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp index 8 @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs