From 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 19 Mar 2020 09:33:03 +0100 Subject: Cleanup: `make format` after SortedIncludes change --- intern/cycles/app/cycles_cubin_cc.cpp | 2 +- intern/cycles/app/cycles_server.cpp | 2 +- intern/cycles/app/cycles_standalone.cpp | 4 +-- intern/cycles/app/cycles_xml.cpp | 4 +-- intern/cycles/blender/blender_device.h | 2 +- intern/cycles/blender/blender_mesh.cpp | 6 ++-- intern/cycles/blender/blender_object.cpp | 6 ++-- intern/cycles/blender/blender_python.cpp | 4 +-- intern/cycles/blender/blender_session.cpp | 2 +- intern/cycles/blender/blender_shader.cpp | 4 +-- intern/cycles/blender/blender_sync.cpp | 6 ++-- intern/cycles/blender/blender_sync.h | 2 +- intern/cycles/blender/blender_texture.h | 2 +- intern/cycles/blender/blender_viewport.h | 2 +- intern/cycles/bvh/bvh_build.cpp | 6 ++-- intern/cycles/bvh/bvh_embree.cpp | 4 +-- intern/cycles/bvh/bvh_optix.cpp | 2 +- intern/cycles/device/cuda/device_cuda_impl.cpp | 2 +- intern/cycles/device/device.cpp | 4 +-- intern/cycles/device/device.h | 2 +- intern/cycles/device/device_cuda.cpp | 2 +- intern/cycles/device/device_memory.cpp | 2 +- intern/cycles/device/device_multi.cpp | 2 +- intern/cycles/device/device_network.cpp | 2 +- intern/cycles/device/device_network.h | 6 ++-- intern/cycles/device/device_opencl.cpp | 2 +- intern/cycles/device/device_optix.cpp | 14 ++++----- intern/cycles/device/opencl/memory_manager.h | 2 +- intern/cycles/device/opencl/opencl_util.cpp | 4 +-- intern/cycles/kernel/kernel.h | 2 +- intern/cycles/kernel/kernel_compat_cpu.h | 4 +-- intern/cycles/kernel/kernel_globals.h | 2 +- intern/cycles/kernel/osl/osl_closures.h | 4 +-- intern/cycles/kernel/osl/osl_globals.h | 2 +- intern/cycles/kernel/osl/osl_services.h | 2 +- .../kernel/shaders/node_environment_texture.osl | 2 +- intern/cycles/kernel/shaders/node_fresnel.osl | 2 +- intern/cycles/kernel/shaders/node_glass_bsdf.osl | 2 +- intern/cycles/kernel/shaders/node_glossy_bsdf.osl | 2 +- intern/cycles/kernel/shaders/node_hsv.osl | 2 +- .../cycles/kernel/shaders/node_image_texture.osl | 2 +- intern/cycles/kernel/shaders/node_layer_weight.osl | 2 +- intern/cycles/kernel/shaders/node_math.osl | 2 +- intern/cycles/kernel/shaders/node_mix.osl | 2 +- .../kernel/shaders/node_musgrave_texture.osl | 2 +- .../cycles/kernel/shaders/node_noise_texture.osl | 2 +- .../cycles/kernel/shaders/node_principled_bsdf.osl | 2 +- intern/cycles/kernel/shaders/node_rgb_curves.osl | 2 +- intern/cycles/kernel/shaders/node_rgb_ramp.osl | 2 +- intern/cycles/kernel/shaders/node_separate_hsv.osl | 2 +- intern/cycles/kernel/shaders/node_sky_texture.osl | 2 +- .../cycles/kernel/shaders/node_vector_curves.osl | 2 +- intern/cycles/kernel/shaders/node_vector_math.osl | 2 +- .../cycles/kernel/shaders/node_vector_rotate.osl | 2 +- intern/cycles/kernel/shaders/node_velvet_bsdf.osl | 2 +- .../cycles/kernel/shaders/node_voronoi_texture.osl | 2 +- intern/cycles/kernel/shaders/node_wave_texture.osl | 2 +- .../kernel/shaders/node_white_noise_texture.osl | 2 +- intern/cycles/kernel/shaders/node_wireframe.osl | 2 +- intern/cycles/kernel/svm/svm.h | 36 +++++++++++----------- intern/cycles/render/attribute.cpp | 4 +-- intern/cycles/render/background.cpp | 2 +- intern/cycles/render/bake.cpp | 2 +- intern/cycles/render/buffers.cpp | 2 +- intern/cycles/render/colorspace.cpp | 2 +- intern/cycles/render/constant_fold.h | 2 +- intern/cycles/render/curves.cpp | 2 +- intern/cycles/render/denoising.h | 2 +- intern/cycles/render/film.cpp | 4 +-- intern/cycles/render/geometry.cpp | 2 +- intern/cycles/render/geometry.h | 2 +- intern/cycles/render/graph.cpp | 4 +-- intern/cycles/render/hair.cpp | 2 +- intern/cycles/render/image.cpp | 2 +- intern/cycles/render/integrator.cpp | 4 +-- intern/cycles/render/light.cpp | 8 ++--- intern/cycles/render/merge.cpp | 2 +- intern/cycles/render/mesh.cpp | 2 +- intern/cycles/render/mesh_subdivision.cpp | 12 ++++---- intern/cycles/render/mesh_volume.cpp | 2 +- intern/cycles/render/nodes.cpp | 6 ++-- intern/cycles/render/nodes.h | 2 +- intern/cycles/render/object.cpp | 8 ++--- intern/cycles/render/object.h | 2 +- intern/cycles/render/osl.cpp | 2 +- intern/cycles/render/particles.cpp | 2 +- intern/cycles/render/scene.cpp | 2 +- intern/cycles/render/session.cpp | 6 ++-- intern/cycles/render/session.h | 2 +- intern/cycles/render/shader.h | 2 +- intern/cycles/render/svm.cpp | 2 +- intern/cycles/render/tables.cpp | 2 +- intern/cycles/test/render_graph_finalize_test.cpp | 4 +-- intern/cycles/test/util_avxf_test.h | 2 +- intern/cycles/util/util_boundbox.h | 2 +- intern/cycles/util/util_disjoint_set.h | 2 +- intern/cycles/util/util_half.h | 2 +- intern/cycles/util/util_md5.cpp | 2 +- intern/cycles/util/util_path.cpp | 4 +-- intern/cycles/util/util_profiling.cpp | 2 +- intern/cycles/util/util_progress.h | 2 +- intern/cycles/util/util_sky_model.cpp | 2 +- intern/cycles/util/util_string.h | 2 +- intern/cycles/util/util_system.cpp | 4 +-- intern/cycles/util/util_task.cpp | 2 +- intern/cycles/util/util_thread.h | 4 +-- intern/cycles/util/util_transform.cpp | 2 +- intern/cycles/util/util_types.h | 2 +- 108 files changed, 173 insertions(+), 173 deletions(-) (limited to 'intern/cycles') diff --git a/intern/cycles/app/cycles_cubin_cc.cpp b/intern/cycles/app/cycles_cubin_cc.cpp index 774c18f4219..9d4d52b34ac 100644 --- a/intern/cycles/app/cycles_cubin_cc.cpp +++ b/intern/cycles/app/cycles_cubin_cc.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp index c5a4c9b375b..1ad70a376ed 100644 --- a/intern/cycles/app/cycles_server.cpp +++ b/intern/cycles/app/cycles_server.cpp @@ -20,11 +20,11 @@ #include "util/util_args.h" #include "util/util_foreach.h" +#include "util/util_logging.h" #include "util/util_path.h" #include "util/util_stats.h" #include "util/util_string.h" #include "util/util_task.h" -#include "util/util_logging.h" using namespace ccl; diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index d2d112e8d7e..e45c37be494 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -16,12 +16,12 @@ #include +#include "device/device.h" #include "render/buffers.h" #include "render/camera.h" -#include "device/device.h" +#include "render/integrator.h" #include "render/scene.h" #include "render/session.h" -#include "render/integrator.h" #include "util/util_args.h" #include "util/util_foreach.h" diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 11db5b1a07d..aec00f845f3 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -16,9 +16,9 @@ #include -#include #include #include +#include #include "graph/node_xml.h" @@ -32,8 +32,8 @@ #include "render/nodes.h" #include "render/object.h" #include "render/osl.h" -#include "render/shader.h" #include "render/scene.h" +#include "render/shader.h" #include "subd/subd_patch.h" #include "subd/subd_split.h" diff --git a/intern/cycles/blender/blender_device.h b/intern/cycles/blender/blender_device.h index fd6c045c966..8d2ecac7483 100644 --- a/intern/cycles/blender/blender_device.h +++ b/intern/cycles/blender/blender_device.h @@ -18,9 +18,9 @@ #define __BLENDER_DEVICE_H__ #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" #include "RNA_blender_cpp.h" +#include "RNA_types.h" #include "device/device.h" diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 075c9250e8c..a6f380a9ae7 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -14,25 +14,25 @@ * limitations under the License. */ +#include "render/camera.h" #include "render/colorspace.h" #include "render/mesh.h" #include "render/object.h" #include "render/scene.h" -#include "render/camera.h" -#include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "blender/blender_sync.h" #include "blender/blender_util.h" #include "subd/subd_patch.h" #include "subd/subd_split.h" #include "util/util_algorithm.h" +#include "util/util_disjoint_set.h" #include "util/util_foreach.h" #include "util/util_hash.h" #include "util/util_logging.h" #include "util/util_math.h" -#include "util/util_disjoint_set.h" #include "mikktspace.h" diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 4e488f12d0d..4b29c28913b 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -15,14 +15,14 @@ */ #include "render/camera.h" -#include "render/integrator.h" #include "render/graph.h" +#include "render/integrator.h" #include "render/light.h" #include "render/mesh.h" -#include "render/object.h" -#include "render/scene.h" #include "render/nodes.h" +#include "render/object.h" #include "render/particles.h" +#include "render/scene.h" #include "render/shader.h" #include "blender/blender_object_cull.h" diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 816b4552fff..89bcebda193 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -19,8 +19,8 @@ #include "blender/CCL_api.h" #include "blender/blender_device.h" -#include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "blender/blender_sync.h" #include "blender/blender_util.h" #include "render/denoising.h" @@ -38,8 +38,8 @@ #ifdef WITH_OSL # include "render/osl.h" -# include # include +# include #endif #ifdef WITH_OPENCL diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 8e01ad9a96d..5ea96d6bdfd 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -41,8 +41,8 @@ #include "util/util_progress.h" #include "util/util_time.h" -#include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "blender/blender_sync.h" #include "blender/blender_util.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 59c1539d207..edde1fd243e 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -24,14 +24,14 @@ #include "render/shader.h" #include "blender/blender_image.h" -#include "blender/blender_texture.h" #include "blender/blender_sync.h" +#include "blender/blender_texture.h" #include "blender/blender_util.h" #include "util/util_debug.h" #include "util/util_foreach.h" -#include "util/util_string.h" #include "util/util_set.h" +#include "util/util_string.h" #include "util/util_task.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 9f7797efb97..91d715af7e2 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -16,6 +16,7 @@ #include "render/background.h" #include "render/camera.h" +#include "render/curves.h" #include "render/film.h" #include "render/graph.h" #include "render/integrator.h" @@ -25,19 +26,18 @@ #include "render/object.h" #include "render/scene.h" #include "render/shader.h" -#include "render/curves.h" #include "device/device.h" #include "blender/blender_device.h" -#include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "blender/blender_sync.h" #include "blender/blender_util.h" #include "util/util_debug.h" #include "util/util_foreach.h" -#include "util/util_opengl.h" #include "util/util_hash.h" +#include "util/util_opengl.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 25e933dc599..650b4f5bb4e 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -18,9 +18,9 @@ #define __BLENDER_SYNC_H__ #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" #include "RNA_blender_cpp.h" +#include "RNA_types.h" #include "blender/blender_id_map.h" #include "blender/blender_viewport.h" diff --git a/intern/cycles/blender/blender_texture.h b/intern/cycles/blender/blender_texture.h index 896bf62da70..8ab061aaed9 100644 --- a/intern/cycles/blender/blender_texture.h +++ b/intern/cycles/blender/blender_texture.h @@ -17,8 +17,8 @@ #ifndef __BLENDER_TEXTURE_H__ #define __BLENDER_TEXTURE_H__ -#include #include "blender/blender_sync.h" +#include CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_viewport.h b/intern/cycles/blender/blender_viewport.h index d2b55358c27..3e44e552f1d 100644 --- a/intern/cycles/blender/blender_viewport.h +++ b/intern/cycles/blender/blender_viewport.h @@ -18,9 +18,9 @@ #define __BLENDER_VIEWPORT_H__ #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" #include "RNA_blender_cpp.h" +#include "RNA_types.h" #include "render/film.h" #include "util/util_param.h" diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp index b472c55d156..db156219f09 100644 --- a/intern/cycles/bvh/bvh_build.cpp +++ b/intern/cycles/bvh/bvh_build.cpp @@ -22,20 +22,20 @@ #include "bvh/bvh_params.h" #include "bvh_split.h" +#include "render/curves.h" #include "render/hair.h" #include "render/mesh.h" #include "render/object.h" #include "render/scene.h" -#include "render/curves.h" #include "util/util_algorithm.h" #include "util/util_foreach.h" #include "util/util_logging.h" #include "util/util_progress.h" -#include "util/util_stack_allocator.h" +#include "util/util_queue.h" #include "util/util_simd.h" +#include "util/util_stack_allocator.h" #include "util/util_time.h" -#include "util/util_queue.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp index 639dfe3cee2..9356adf3ea5 100644 --- a/intern/cycles/bvh/bvh_embree.cpp +++ b/intern/cycles/bvh/bvh_embree.cpp @@ -35,9 +35,9 @@ #ifdef WITH_EMBREE +# include # include # include -# include # include "bvh/bvh_embree.h" @@ -45,9 +45,9 @@ */ # include "kernel/bvh/bvh_embree.h" # include "kernel/kernel_compat_cpu.h" -# include "kernel/split/kernel_split_data_types.h" # include "kernel/kernel_globals.h" # include "kernel/kernel_random.h" +# include "kernel/split/kernel_split_data_types.h" # include "render/hair.h" # include "render/mesh.h" diff --git a/intern/cycles/bvh/bvh_optix.cpp b/intern/cycles/bvh/bvh_optix.cpp index da548e9c0db..26b64c24db5 100644 --- a/intern/cycles/bvh/bvh_optix.cpp +++ b/intern/cycles/bvh/bvh_optix.cpp @@ -18,8 +18,8 @@ #ifdef WITH_OPTIX # include "bvh/bvh_optix.h" -# include "render/hair.h" # include "render/geometry.h" +# include "render/hair.h" # include "render/mesh.h" # include "render/object.h" # include "util/util_foreach.h" diff --git a/intern/cycles/device/cuda/device_cuda_impl.cpp b/intern/cycles/device/cuda/device_cuda_impl.cpp index a4e7bc2f64a..0f261ef2f70 100644 --- a/intern/cycles/device/cuda/device_cuda_impl.cpp +++ b/intern/cycles/device/cuda/device_cuda_impl.cpp @@ -39,8 +39,8 @@ # include "util/util_path.h" # include "util/util_string.h" # include "util/util_system.h" -# include "util/util_types.h" # include "util/util_time.h" +# include "util/util_types.h" # include "util/util_windows.h" # include "kernel/split/kernel_split_data_types.h" diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index c0d02e0605f..d94d409175b 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -25,11 +25,11 @@ #include "util/util_logging.h" #include "util/util_math.h" #include "util/util_opengl.h" -#include "util/util_time.h" +#include "util/util_string.h" #include "util/util_system.h" +#include "util/util_time.h" #include "util/util_types.h" #include "util/util_vector.h" -#include "util/util_string.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 2aeed3f0e89..a98ac171709 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -27,8 +27,8 @@ #include "util/util_list.h" #include "util/util_stats.h" #include "util/util_string.h" -#include "util/util_thread.h" #include "util/util_texture.h" +#include "util/util_thread.h" #include "util/util_types.h" #include "util/util_vector.h" diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 6957adb478f..9a703b45c0a 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -16,9 +16,9 @@ #ifdef WITH_CUDA +# include "device/cuda/device_cuda.h" # include "device/device.h" # include "device/device_intern.h" -# include "device/cuda/device_cuda.h" # include "util/util_logging.h" # include "util/util_string.h" diff --git a/intern/cycles/device/device_memory.cpp b/intern/cycles/device/device_memory.cpp index 3c4f68cfc77..671cd7c29f3 100644 --- a/intern/cycles/device/device_memory.cpp +++ b/intern/cycles/device/device_memory.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "device/device.h" #include "device/device_memory.h" +#include "device/device.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 631c4169e2e..3636ecaa7a1 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include "device/device.h" #include "device/device_intern.h" diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp index 80334ad8f22..2742cbf53aa 100644 --- a/intern/cycles/device/device_network.cpp +++ b/intern/cycles/device/device_network.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "device/device_network.h" #include "device/device.h" #include "device/device_intern.h" -#include "device/device_network.h" #include "util/util_foreach.h" #include "util/util_logging.h" diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index 5b69b815cc6..e74c4508ab6 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -19,19 +19,19 @@ #ifdef WITH_NETWORK -# include -# include # include # include +# include +# include # include # include # include # include # include +# include # include # include -# include # include "render/buffers.h" diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index ccfc53d5a21..891b73351a0 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -16,9 +16,9 @@ #ifdef WITH_OPENCL +# include "device/opencl/device_opencl.h" # include "device/device.h" # include "device/device_intern.h" -# include "device/opencl/device_opencl.h" # include "util/util_foreach.h" # include "util/util_logging.h" diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index 329876ce6f6..c23732839b6 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -17,28 +17,28 @@ #ifdef WITH_OPTIX +# include "bvh/bvh.h" # include "device/cuda/device_cuda.h" -# include "device/device_intern.h" # include "device/device_denoising.h" -# include "bvh/bvh.h" -# include "render/scene.h" +# include "device/device_intern.h" +# include "render/buffers.h" # include "render/hair.h" # include "render/mesh.h" # include "render/object.h" -# include "render/buffers.h" +# include "render/scene.h" +# include "util/util_debug.h" +# include "util/util_logging.h" # include "util/util_md5.h" # include "util/util_path.h" # include "util/util_time.h" -# include "util/util_debug.h" -# include "util/util_logging.h" # ifdef WITH_CUDA_DYNLOAD # include // Do not use CUDA SDK headers when using CUEW # define OPTIX_DONT_INCLUDE_CUDA # endif -# include # include +# include // TODO(pmours): Disable this once drivers have native support # define OPTIX_DENOISER_NO_PIXEL_STRIDE 1 diff --git a/intern/cycles/device/opencl/memory_manager.h b/intern/cycles/device/opencl/memory_manager.h index 2fbc97a0756..23624f837a6 100644 --- a/intern/cycles/device/opencl/memory_manager.h +++ b/intern/cycles/device/opencl/memory_manager.h @@ -19,8 +19,8 @@ #include "device/device.h" #include "util/util_map.h" -#include "util/util_vector.h" #include "util/util_string.h" +#include "util/util_vector.h" #include "clew.h" diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp index f59f109db70..580a73f6e8b 100644 --- a/intern/cycles/device/opencl/opencl_util.cpp +++ b/intern/cycles/device/opencl/opencl_util.cpp @@ -16,15 +16,15 @@ #ifdef WITH_OPENCL -# include "device/opencl/device_opencl.h" # include "device/device_intern.h" +# include "device/opencl/device_opencl.h" # include "util/util_debug.h" # include "util/util_logging.h" # include "util/util_md5.h" # include "util/util_path.h" -# include "util/util_time.h" # include "util/util_system.h" +# include "util/util_time.h" using std::cerr; using std::endl; diff --git a/intern/cycles/kernel/kernel.h b/intern/cycles/kernel/kernel.h index 3debfc76fbb..b907c6a2bac 100644 --- a/intern/cycles/kernel/kernel.h +++ b/intern/cycles/kernel/kernel.h @@ -19,8 +19,8 @@ /* CPU Kernel Interface */ -#include "util/util_types.h" #include "kernel/kernel_types.h" +#include "util/util_types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h index 006dd00dd73..88f6a264a5a 100644 --- a/intern/cycles/kernel/kernel_compat_cpu.h +++ b/intern/cycles/kernel/kernel_compat_cpu.h @@ -35,11 +35,11 @@ # define __NODES_FEATURES__ NODE_FEATURE_ALL #endif +#include "util/util_half.h" #include "util/util_math.h" #include "util/util_simd.h" -#include "util/util_half.h" -#include "util/util_types.h" #include "util/util_texture.h" +#include "util/util_types.h" #define ccl_addr_space diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h index a440021b6b9..c186e8560eb 100644 --- a/intern/cycles/kernel/kernel_globals.h +++ b/intern/cycles/kernel/kernel_globals.h @@ -22,8 +22,8 @@ #include "kernel/kernel_profiling.h" #ifdef __KERNEL_CPU__ -# include "util/util_vector.h" # include "util/util_map.h" +# include "util/util_vector.h" #endif #ifdef __KERNEL_OPENCL__ diff --git a/intern/cycles/kernel/osl/osl_closures.h b/intern/cycles/kernel/osl/osl_closures.h index d3db6b71f5c..d12afdb80dd 100644 --- a/intern/cycles/kernel/osl/osl_closures.h +++ b/intern/cycles/kernel/osl/osl_closures.h @@ -33,12 +33,12 @@ #ifndef __OSL_CLOSURES_H__ #define __OSL_CLOSURES_H__ -#include "util/util_types.h" #include "kernel/kernel_types.h" +#include "util/util_types.h" +#include #include #include -#include CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h index 0e6c8d21534..c06c9abd4c1 100644 --- a/intern/cycles/kernel/osl/osl_globals.h +++ b/intern/cycles/kernel/osl/osl_globals.h @@ -27,8 +27,8 @@ # include "util/util_map.h" # include "util/util_param.h" # include "util/util_thread.h" -# include "util/util_vector.h" # include "util/util_unique_ptr.h" +# include "util/util_vector.h" # ifndef WIN32 using std::isfinite; diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 469c5188730..d32dace23bf 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -25,8 +25,8 @@ * attributes. */ -#include #include +#include #ifdef WITH_PTEX class PtexCache; diff --git a/intern/cycles/kernel/shaders/node_environment_texture.osl b/intern/cycles/kernel/shaders/node_environment_texture.osl index 2bae30c785c..d04743eb368 100644 --- a/intern/cycles/kernel/shaders/node_environment_texture.osl +++ b/intern/cycles/kernel/shaders/node_environment_texture.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" vector environment_texture_direction_to_equirectangular(vector dir) { diff --git a/intern/cycles/kernel/shaders/node_fresnel.osl b/intern/cycles/kernel/shaders/node_fresnel.osl index 1658debf82c..cff084c344d 100644 --- a/intern/cycles/kernel/shaders/node_fresnel.osl +++ b/intern/cycles/kernel/shaders/node_fresnel.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_fresnel(float IOR = 1.45, normal Normal = N, output float Fac = 0.0) { diff --git a/intern/cycles/kernel/shaders/node_glass_bsdf.osl b/intern/cycles/kernel/shaders/node_glass_bsdf.osl index 120d57c37dd..0042d573f8d 100644 --- a/intern/cycles/kernel/shaders/node_glass_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_glass_bsdf.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_glass_bsdf(color Color = 0.8, string distribution = "sharp", diff --git a/intern/cycles/kernel/shaders/node_glossy_bsdf.osl b/intern/cycles/kernel/shaders/node_glossy_bsdf.osl index a93b013c1d6..c73604d3650 100644 --- a/intern/cycles/kernel/shaders/node_glossy_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_glossy_bsdf.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_glossy_bsdf(color Color = 0.8, string distribution = "GGX", diff --git a/intern/cycles/kernel/shaders/node_hsv.osl b/intern/cycles/kernel/shaders/node_hsv.osl index 40bef11977e..4417057b10f 100644 --- a/intern/cycles/kernel/shaders/node_hsv.osl +++ b/intern/cycles/kernel/shaders/node_hsv.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" shader node_hsv(float Hue = 0.5, float Saturation = 1.0, diff --git a/intern/cycles/kernel/shaders/node_image_texture.osl b/intern/cycles/kernel/shaders/node_image_texture.osl index bfaab514321..22d34a1082c 100644 --- a/intern/cycles/kernel/shaders/node_image_texture.osl +++ b/intern/cycles/kernel/shaders/node_image_texture.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" point texco_remap_square(point co) { diff --git a/intern/cycles/kernel/shaders/node_layer_weight.osl b/intern/cycles/kernel/shaders/node_layer_weight.osl index 4da69b62d2e..1662be2cad1 100644 --- a/intern/cycles/kernel/shaders/node_layer_weight.osl +++ b/intern/cycles/kernel/shaders/node_layer_weight.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_layer_weight(float Blend = 0.5, normal Normal = N, diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl index 6c3dd1547a6..dbaa7ccb60e 100644 --- a/intern/cycles/kernel/shaders/node_math.osl +++ b/intern/cycles/kernel/shaders/node_math.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_math.h" +#include "stdcycles.h" /* OSL asin, acos, and pow functions are safe by default. */ shader node_math(string type = "add", diff --git a/intern/cycles/kernel/shaders/node_mix.osl b/intern/cycles/kernel/shaders/node_mix.osl index a296b139af5..a13b4bb7b96 100644 --- a/intern/cycles/kernel/shaders/node_mix.osl +++ b/intern/cycles/kernel/shaders/node_mix.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" color node_mix_blend(float t, color col1, color col2) { diff --git a/intern/cycles/kernel/shaders/node_musgrave_texture.osl b/intern/cycles/kernel/shaders/node_musgrave_texture.osl index cd054102968..d03b84c1ab4 100644 --- a/intern/cycles/kernel/shaders/node_musgrave_texture.osl +++ b/intern/cycles/kernel/shaders/node_musgrave_texture.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_noise.h" +#include "stdcycles.h" #include "vector2.h" #include "vector4.h" diff --git a/intern/cycles/kernel/shaders/node_noise_texture.osl b/intern/cycles/kernel/shaders/node_noise_texture.osl index ab8f304c80d..4121b415673 100644 --- a/intern/cycles/kernel/shaders/node_noise_texture.osl +++ b/intern/cycles/kernel/shaders/node_noise_texture.osl @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "node_noise.h" #include "stdcycles.h" #include "vector2.h" #include "vector4.h" -#include "node_noise.h" #define vector3 point diff --git a/intern/cycles/kernel/shaders/node_principled_bsdf.osl b/intern/cycles/kernel/shaders/node_principled_bsdf.osl index 7fb562ffe47..1711811ac65 100644 --- a/intern/cycles/kernel/shaders/node_principled_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_principled_bsdf.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_principled_bsdf(string distribution = "Multiscatter GGX", string subsurface_method = "burley", diff --git a/intern/cycles/kernel/shaders/node_rgb_curves.osl b/intern/cycles/kernel/shaders/node_rgb_curves.osl index 1aca7966257..8850040d580 100644 --- a/intern/cycles/kernel/shaders/node_rgb_curves.osl +++ b/intern/cycles/kernel/shaders/node_rgb_curves.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_ramp_util.h" +#include "stdcycles.h" shader node_rgb_curves(color ramp[] = {0.0}, float min_x = 0.0, diff --git a/intern/cycles/kernel/shaders/node_rgb_ramp.osl b/intern/cycles/kernel/shaders/node_rgb_ramp.osl index 5d4e13cbca6..2131edb2688 100644 --- a/intern/cycles/kernel/shaders/node_rgb_ramp.osl +++ b/intern/cycles/kernel/shaders/node_rgb_ramp.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_ramp_util.h" +#include "stdcycles.h" shader node_rgb_ramp(color ramp_color[] = {0.0}, float ramp_alpha[] = {0.0}, diff --git a/intern/cycles/kernel/shaders/node_separate_hsv.osl b/intern/cycles/kernel/shaders/node_separate_hsv.osl index ad1d7ae70d7..2f902b72dbc 100644 --- a/intern/cycles/kernel/shaders/node_separate_hsv.osl +++ b/intern/cycles/kernel/shaders/node_separate_hsv.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" shader node_separate_hsv(color Color = 0.8, output float H = 0.0, diff --git a/intern/cycles/kernel/shaders/node_sky_texture.osl b/intern/cycles/kernel/shaders/node_sky_texture.osl index 145a95800b2..4def237a2e0 100644 --- a/intern/cycles/kernel/shaders/node_sky_texture.osl +++ b/intern/cycles/kernel/shaders/node_sky_texture.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" float sky_angle_between(float thetav, float phiv, float theta, float phi) { diff --git a/intern/cycles/kernel/shaders/node_vector_curves.osl b/intern/cycles/kernel/shaders/node_vector_curves.osl index 41993fd8b56..9d3a2b82b0a 100644 --- a/intern/cycles/kernel/shaders/node_vector_curves.osl +++ b/intern/cycles/kernel/shaders/node_vector_curves.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_ramp_util.h" +#include "stdcycles.h" shader node_vector_curves(color ramp[] = {0.0}, float min_x = 0.0, diff --git a/intern/cycles/kernel/shaders/node_vector_math.osl b/intern/cycles/kernel/shaders/node_vector_math.osl index 7f3ea781f38..218851598b4 100644 --- a/intern/cycles/kernel/shaders/node_vector_math.osl +++ b/intern/cycles/kernel/shaders/node_vector_math.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_math.h" +#include "stdcycles.h" shader node_vector_math(string type = "add", vector Vector1 = vector(0.0, 0.0, 0.0), diff --git a/intern/cycles/kernel/shaders/node_vector_rotate.osl b/intern/cycles/kernel/shaders/node_vector_rotate.osl index d32733b0966..2efe3470ae2 100644 --- a/intern/cycles/kernel/shaders/node_vector_rotate.osl +++ b/intern/cycles/kernel/shaders/node_vector_rotate.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_math.h" +#include "stdcycles.h" shader node_vector_rotate(int invert = 0, string type = "axis", diff --git a/intern/cycles/kernel/shaders/node_velvet_bsdf.osl b/intern/cycles/kernel/shaders/node_velvet_bsdf.osl index 2a35a3da5a5..299acef35ee 100644 --- a/intern/cycles/kernel/shaders/node_velvet_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_velvet_bsdf.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_velvet_bsdf(color Color = 0.8, float Sigma = 0.0, diff --git a/intern/cycles/kernel/shaders/node_voronoi_texture.osl b/intern/cycles/kernel/shaders/node_voronoi_texture.osl index 7a24cde95fc..04d61c32f8a 100644 --- a/intern/cycles/kernel/shaders/node_voronoi_texture.osl +++ b/intern/cycles/kernel/shaders/node_voronoi_texture.osl @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "node_hash.h" #include "stdcycles.h" #include "vector2.h" #include "vector4.h" -#include "node_hash.h" #define vector3 point diff --git a/intern/cycles/kernel/shaders/node_wave_texture.osl b/intern/cycles/kernel/shaders/node_wave_texture.osl index 5cc77aac75a..f17397be243 100644 --- a/intern/cycles/kernel/shaders/node_wave_texture.osl +++ b/intern/cycles/kernel/shaders/node_wave_texture.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_noise.h" +#include "stdcycles.h" /* Wave */ diff --git a/intern/cycles/kernel/shaders/node_white_noise_texture.osl b/intern/cycles/kernel/shaders/node_white_noise_texture.osl index 03b791b04ef..94735a019d5 100644 --- a/intern/cycles/kernel/shaders/node_white_noise_texture.osl +++ b/intern/cycles/kernel/shaders/node_white_noise_texture.osl @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "node_hash.h" #include "stdcycles.h" #include "vector2.h" #include "vector4.h" -#include "node_hash.h" #define vector3 point diff --git a/intern/cycles/kernel/shaders/node_wireframe.osl b/intern/cycles/kernel/shaders/node_wireframe.osl index d5d5b63ade8..673a451c928 100644 --- a/intern/cycles/kernel/shaders/node_wireframe.osl +++ b/intern/cycles/kernel/shaders/node_wireframe.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "oslutil.h" +#include "stdcycles.h" shader node_wireframe(string bump_offset = "center", int use_pixel_size = 0, diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 88c9dbf5838..02c0cb48108 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -161,53 +161,53 @@ CCL_NAMESPACE_END #include "svm_fractal_noise.h" #include "kernel/svm/svm_color_util.h" -#include "kernel/svm/svm_math_util.h" #include "kernel/svm/svm_mapping_util.h" +#include "kernel/svm/svm_math_util.h" #include "kernel/svm/svm_aov.h" #include "kernel/svm/svm_attribute.h" -#include "kernel/svm/svm_gradient.h" #include "kernel/svm/svm_blackbody.h" +#include "kernel/svm/svm_brick.h" +#include "kernel/svm/svm_brightness.h" +#include "kernel/svm/svm_bump.h" +#include "kernel/svm/svm_camera.h" +#include "kernel/svm/svm_checker.h" +#include "kernel/svm/svm_clamp.h" #include "kernel/svm/svm_closure.h" -#include "kernel/svm/svm_noisetex.h" #include "kernel/svm/svm_convert.h" #include "kernel/svm/svm_displace.h" #include "kernel/svm/svm_fresnel.h" -#include "kernel/svm/svm_wireframe.h" -#include "kernel/svm/svm_wavelength.h" -#include "kernel/svm/svm_camera.h" +#include "kernel/svm/svm_gamma.h" #include "kernel/svm/svm_geometry.h" +#include "kernel/svm/svm_gradient.h" #include "kernel/svm/svm_hsv.h" #include "kernel/svm/svm_ies.h" #include "kernel/svm/svm_image.h" -#include "kernel/svm/svm_gamma.h" -#include "kernel/svm/svm_brightness.h" #include "kernel/svm/svm_invert.h" #include "kernel/svm/svm_light_path.h" #include "kernel/svm/svm_magic.h" +#include "kernel/svm/svm_map_range.h" #include "kernel/svm/svm_mapping.h" -#include "kernel/svm/svm_normal.h" -#include "kernel/svm/svm_wave.h" #include "kernel/svm/svm_math.h" #include "kernel/svm/svm_mix.h" +#include "kernel/svm/svm_musgrave.h" +#include "kernel/svm/svm_noisetex.h" +#include "kernel/svm/svm_normal.h" #include "kernel/svm/svm_ramp.h" #include "kernel/svm/svm_sepcomb_hsv.h" #include "kernel/svm/svm_sepcomb_vector.h" -#include "kernel/svm/svm_musgrave.h" #include "kernel/svm/svm_sky.h" #include "kernel/svm/svm_tex_coord.h" #include "kernel/svm/svm_value.h" -#include "kernel/svm/svm_voronoi.h" -#include "kernel/svm/svm_checker.h" -#include "kernel/svm/svm_brick.h" #include "kernel/svm/svm_vector_rotate.h" #include "kernel/svm/svm_vector_transform.h" +#include "kernel/svm/svm_vertex_color.h" +#include "kernel/svm/svm_voronoi.h" #include "kernel/svm/svm_voxel.h" -#include "kernel/svm/svm_bump.h" -#include "kernel/svm/svm_map_range.h" -#include "kernel/svm/svm_clamp.h" +#include "kernel/svm/svm_wave.h" +#include "kernel/svm/svm_wavelength.h" #include "kernel/svm/svm_white_noise.h" -#include "kernel/svm/svm_vertex_color.h" +#include "kernel/svm/svm_wireframe.h" #ifdef __SHADER_RAYTRACE__ # include "kernel/svm/svm_ao.h" diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp index d0d9888ac88..a3d3c1c2bda 100644 --- a/intern/cycles/render/attribute.cpp +++ b/intern/cycles/render/attribute.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "render/image.h" +#include "render/attribute.h" #include "render/hair.h" +#include "render/image.h" #include "render/mesh.h" -#include "render/attribute.h" #include "util/util_foreach.h" #include "util/util_transform.h" diff --git a/intern/cycles/render/background.cpp b/intern/cycles/render/background.cpp index 25ec0d3f0ba..694bb640995 100644 --- a/intern/cycles/render/background.cpp +++ b/intern/cycles/render/background.cpp @@ -16,8 +16,8 @@ #include "render/background.h" #include "device/device.h" -#include "render/integrator.h" #include "render/graph.h" +#include "render/integrator.h" #include "render/nodes.h" #include "render/scene.h" #include "render/shader.h" diff --git a/intern/cycles/render/bake.cpp b/intern/cycles/render/bake.cpp index 11ccfc95293..35f942b3e9b 100644 --- a/intern/cycles/render/bake.cpp +++ b/intern/cycles/render/bake.cpp @@ -15,10 +15,10 @@ */ #include "render/bake.h" +#include "render/integrator.h" #include "render/mesh.h" #include "render/object.h" #include "render/shader.h" -#include "render/integrator.h" #include "util/util_foreach.h" diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index 19d3f00bf82..2d89fb9ffba 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -16,8 +16,8 @@ #include -#include "render/buffers.h" #include "device/device.h" +#include "render/buffers.h" #include "util/util_foreach.h" #include "util/util_hash.h" diff --git a/intern/cycles/render/colorspace.cpp b/intern/cycles/render/colorspace.cpp index 7684d48756f..7605fcaf5ff 100644 --- a/intern/cycles/render/colorspace.cpp +++ b/intern/cycles/render/colorspace.cpp @@ -17,8 +17,8 @@ #include "render/colorspace.h" #include "util/util_color.h" -#include "util/util_image.h" #include "util/util_half.h" +#include "util/util_image.h" #include "util/util_logging.h" #include "util/util_math.h" #include "util/util_thread.h" diff --git a/intern/cycles/render/constant_fold.h b/intern/cycles/render/constant_fold.h index 7f622488a88..fec4123c361 100644 --- a/intern/cycles/render/constant_fold.h +++ b/intern/cycles/render/constant_fold.h @@ -17,8 +17,8 @@ #ifndef __CONSTANT_FOLD_H__ #define __CONSTANT_FOLD_H__ -#include "util/util_types.h" #include "kernel/svm/svm_types.h" +#include "util/util_types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/curves.cpp b/intern/cycles/render/curves.cpp index 66fbc9eb4a8..1907bb33d06 100644 --- a/intern/cycles/render/curves.cpp +++ b/intern/cycles/render/curves.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "device/device.h" #include "render/curves.h" +#include "device/device.h" #include "render/mesh.h" #include "render/object.h" #include "render/scene.h" diff --git a/intern/cycles/render/denoising.h b/intern/cycles/render/denoising.h index c234d00eb49..5c6f913cb38 100644 --- a/intern/cycles/render/denoising.h +++ b/intern/cycles/render/denoising.h @@ -23,8 +23,8 @@ #include "render/buffers.h" #include "util/util_string.h" -#include "util/util_vector.h" #include "util/util_unique_ptr.h" +#include "util/util_vector.h" #include diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp index 48d9c97e0fb..d1e2ef66c2c 100644 --- a/intern/cycles/render/film.cpp +++ b/intern/cycles/render/film.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "render/camera.h" -#include "device/device.h" #include "render/film.h" +#include "device/device.h" +#include "render/camera.h" #include "render/integrator.h" #include "render/mesh.h" #include "render/scene.h" diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp index 748a8f7cf67..d46ed430c4f 100644 --- a/intern/cycles/render/geometry.cpp +++ b/intern/cycles/render/geometry.cpp @@ -33,8 +33,8 @@ #include "render/shader.h" #include "render/stats.h" -#include "subd/subd_split.h" #include "subd/subd_patch_table.h" +#include "subd/subd_split.h" #include "kernel/osl/osl_globals.h" diff --git a/intern/cycles/render/geometry.h b/intern/cycles/render/geometry.h index 82f539d391d..b0284304843 100644 --- a/intern/cycles/render/geometry.h +++ b/intern/cycles/render/geometry.h @@ -24,8 +24,8 @@ #include "render/attribute.h" #include "util/util_boundbox.h" -#include "util/util_transform.h" #include "util/util_set.h" +#include "util/util_transform.h" #include "util/util_types.h" #include "util/util_vector.h" diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 0e520c700a7..d2db59894ea 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "render/attribute.h" #include "render/graph.h" +#include "render/attribute.h" +#include "render/constant_fold.h" #include "render/nodes.h" #include "render/scene.h" #include "render/shader.h" -#include "render/constant_fold.h" #include "util/util_algorithm.h" #include "util/util_foreach.h" diff --git a/intern/cycles/render/hair.cpp b/intern/cycles/render/hair.cpp index 7220fe7093b..3daa4cc1e35 100644 --- a/intern/cycles/render/hair.cpp +++ b/intern/cycles/render/hair.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "render/curves.h" #include "render/hair.h" +#include "render/curves.h" #include "render/scene.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 23f97ba5aa3..40fdf4b4119 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -15,9 +15,9 @@ */ #include "render/image.h" -#include "render/image_oiio.h" #include "device/device.h" #include "render/colorspace.h" +#include "render/image_oiio.h" #include "render/scene.h" #include "render/stats.h" diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp index d856f7a300f..2f9d088899e 100644 --- a/intern/cycles/render/integrator.cpp +++ b/intern/cycles/render/integrator.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "render/integrator.h" #include "device/device.h" #include "render/background.h" -#include "render/integrator.h" #include "render/film.h" #include "render/jitter.h" #include "render/light.h" @@ -27,8 +27,8 @@ #include "kernel/kernel_types.h" #include "util/util_foreach.h" -#include "util/util_logging.h" #include "util/util_hash.h" +#include "util/util_logging.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 8263f68fa9c..9adf8e5341a 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "render/background.h" +#include "render/light.h" #include "device/device.h" -#include "render/integrator.h" +#include "render/background.h" #include "render/film.h" #include "render/graph.h" -#include "render/light.h" +#include "render/integrator.h" #include "render/mesh.h" #include "render/nodes.h" #include "render/object.h" @@ -28,9 +28,9 @@ #include "util/util_foreach.h" #include "util/util_hash.h" +#include "util/util_logging.h" #include "util/util_path.h" #include "util/util_progress.h" -#include "util/util_logging.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/merge.cpp b/intern/cycles/render/merge.cpp index cac07e59fe3..3ea3952b96c 100644 --- a/intern/cycles/render/merge.cpp +++ b/intern/cycles/render/merge.cpp @@ -22,8 +22,8 @@ #include "util/util_time.h" #include "util/util_unique_ptr.h" -#include #include +#include OIIO_NAMESPACE_USING diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index f855697b889..c262d770331 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -25,8 +25,8 @@ #include "render/object.h" #include "render/scene.h" -#include "subd/subd_split.h" #include "subd/subd_patch_table.h" +#include "subd/subd_split.h" #include "util/util_foreach.h" #include "util/util_logging.h" diff --git a/intern/cycles/render/mesh_subdivision.cpp b/intern/cycles/render/mesh_subdivision.cpp index 40dd658eadd..3d72b2fab91 100644 --- a/intern/cycles/render/mesh_subdivision.cpp +++ b/intern/cycles/render/mesh_subdivision.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "render/mesh.h" #include "render/attribute.h" #include "render/camera.h" +#include "render/mesh.h" -#include "subd/subd_split.h" #include "subd/subd_patch.h" #include "subd/subd_patch_table.h" +#include "subd/subd_split.h" -#include "util/util_foreach.h" #include "util/util_algorithm.h" +#include "util/util_foreach.h" #include "util/util_hash.h" CCL_NAMESPACE_BEGIN @@ -32,10 +32,10 @@ CCL_NAMESPACE_BEGIN CCL_NAMESPACE_END -# include -# include -# include # include +# include +# include +# include /* specializations of TopologyRefinerFactory for ccl::Mesh */ diff --git a/intern/cycles/render/mesh_volume.cpp b/intern/cycles/render/mesh_volume.cpp index 241be2d7592..d73ba3b06dd 100644 --- a/intern/cycles/render/mesh_volume.cpp +++ b/intern/cycles/render/mesh_volume.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "render/mesh.h" #include "render/attribute.h" +#include "render/mesh.h" #include "render/scene.h" #include "util/util_foreach.h" diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 26b816b65e9..ac07d91c4ca 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -14,17 +14,17 @@ * limitations under the License. */ +#include "render/nodes.h" #include "render/colorspace.h" +#include "render/constant_fold.h" #include "render/film.h" #include "render/image.h" #include "render/integrator.h" #include "render/light.h" #include "render/mesh.h" -#include "render/nodes.h" +#include "render/osl.h" #include "render/scene.h" #include "render/svm.h" -#include "render/osl.h" -#include "render/constant_fold.h" #include "util/util_foreach.h" #include "util/util_logging.h" diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index 1f52a2a49ab..e79de34bc2c 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -17,9 +17,9 @@ #ifndef __NODES_H__ #define __NODES_H__ +#include "graph/node.h" #include "render/graph.h" #include "render/image.h" -#include "graph/node.h" #include "util/util_array.h" #include "util/util_string.h" diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 342a641c0be..90a1d90019d 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -14,24 +14,24 @@ * limitations under the License. */ -#include "render/camera.h" +#include "render/object.h" #include "device/device.h" +#include "render/camera.h" +#include "render/curves.h" #include "render/hair.h" #include "render/integrator.h" #include "render/light.h" #include "render/mesh.h" -#include "render/curves.h" -#include "render/object.h" #include "render/particles.h" #include "render/scene.h" #include "util/util_foreach.h" #include "util/util_logging.h" #include "util/util_map.h" +#include "util/util_murmurhash.h" #include "util/util_progress.h" #include "util/util_set.h" #include "util/util_vector.h" -#include "util/util_murmurhash.h" #include "subd/subd_patch_table.h" diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h index 2c2870cd0f2..7c84c2de4fb 100644 --- a/intern/cycles/render/object.h +++ b/intern/cycles/render/object.h @@ -23,8 +23,8 @@ #include "util/util_array.h" #include "util/util_boundbox.h" #include "util/util_param.h" -#include "util/util_transform.h" #include "util/util_thread.h" +#include "util/util_transform.h" #include "util/util_types.h" #include "util/util_vector.h" diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 74eb61e2dff..06d832a29ca 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -20,10 +20,10 @@ #include "render/colorspace.h" #include "render/graph.h" #include "render/light.h" +#include "render/nodes.h" #include "render/osl.h" #include "render/scene.h" #include "render/shader.h" -#include "render/nodes.h" #ifdef WITH_OSL diff --git a/intern/cycles/render/particles.cpp b/intern/cycles/render/particles.cpp index 8335404b197..ec9276eff86 100644 --- a/intern/cycles/render/particles.cpp +++ b/intern/cycles/render/particles.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "device/device.h" #include "render/particles.h" +#include "device/device.h" #include "render/scene.h" #include "util/util_foreach.h" diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index e827a424c3c..f5b68d5a4fe 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -16,11 +16,11 @@ #include +#include "device/device.h" #include "render/background.h" #include "render/bake.h" #include "render/camera.h" #include "render/curves.h" -#include "device/device.h" #include "render/film.h" #include "render/integrator.h" #include "render/light.h" diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index b5d434a604c..b1b30979b0e 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -14,12 +14,13 @@ * limitations under the License. */ -#include #include +#include +#include "device/device.h" +#include "render/bake.h" #include "render/buffers.h" #include "render/camera.h" -#include "device/device.h" #include "render/graph.h" #include "render/integrator.h" #include "render/light.h" @@ -27,7 +28,6 @@ #include "render/object.h" #include "render/scene.h" #include "render/session.h" -#include "render/bake.h" #include "util/util_foreach.h" #include "util/util_function.h" diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index 8053e46b12e..61970d87e9c 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -17,8 +17,8 @@ #ifndef __SESSION_H__ #define __SESSION_H__ -#include "render/buffers.h" #include "device/device.h" +#include "render/buffers.h" #include "render/shader.h" #include "render/stats.h" #include "render/tile.h" diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index 1509150228f..7801fd29276 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -23,8 +23,8 @@ # include #endif -#include "render/attribute.h" #include "kernel/kernel_types.h" +#include "render/attribute.h" #include "graph/node.h" diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index c4218f7df1e..b4858f488c3 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -25,8 +25,8 @@ #include "render/shader.h" #include "render/svm.h" -#include "util/util_logging.h" #include "util/util_foreach.h" +#include "util/util_logging.h" #include "util/util_progress.h" #include "util/util_task.h" diff --git a/intern/cycles/render/tables.cpp b/intern/cycles/render/tables.cpp index d88925939e3..270e05abe29 100644 --- a/intern/cycles/render/tables.cpp +++ b/intern/cycles/render/tables.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "render/tables.h" #include "device/device.h" #include "render/scene.h" -#include "render/tables.h" #include "util/util_logging.h" diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp index ca93f8b02d0..87389ebfb16 100644 --- a/intern/cycles/test/render_graph_finalize_test.cpp +++ b/intern/cycles/test/render_graph_finalize_test.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "testing/testing.h" #include "testing/mock_log.h" +#include "testing/testing.h" #include "render/graph.h" -#include "render/scene.h" #include "render/nodes.h" +#include "render/scene.h" #include "util/util_array.h" #include "util/util_logging.h" #include "util/util_string.h" diff --git a/intern/cycles/test/util_avxf_test.h b/intern/cycles/test/util_avxf_test.h index 353c8fa9b28..d93563fdb3f 100644 --- a/intern/cycles/test/util_avxf_test.h +++ b/intern/cycles/test/util_avxf_test.h @@ -15,8 +15,8 @@ */ #include "testing/testing.h" -#include "util/util_types.h" #include "util/util_system.h" +#include "util/util_types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/util_boundbox.h index b5c3f1a8954..7fab7bd5a15 100644 --- a/intern/cycles/util/util_boundbox.h +++ b/intern/cycles/util/util_boundbox.h @@ -17,8 +17,8 @@ #ifndef __UTIL_BOUNDBOX_H__ #define __UTIL_BOUNDBOX_H__ -#include #include +#include #include "util/util_math.h" #include "util/util_string.h" diff --git a/intern/cycles/util/util_disjoint_set.h b/intern/cycles/util/util_disjoint_set.h index 80f3c714a29..946632371d2 100644 --- a/intern/cycles/util/util_disjoint_set.h +++ b/intern/cycles/util/util_disjoint_set.h @@ -17,8 +17,8 @@ #ifndef __UTIL_DISJOINT_SET_H__ #define __UTIL_DISJOINT_SET_H__ -#include #include "util_array.h" +#include CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_half.h b/intern/cycles/util/util_half.h index 647e9cf2fd6..8de62893ba8 100644 --- a/intern/cycles/util/util_half.h +++ b/intern/cycles/util/util_half.h @@ -17,8 +17,8 @@ #ifndef __UTIL_HALF_H__ #define __UTIL_HALF_H__ -#include "util/util_types.h" #include "util/util_math.h" +#include "util/util_types.h" #ifdef __KERNEL_SSE2__ # include "util/util_simd.h" diff --git a/intern/cycles/util/util_md5.cpp b/intern/cycles/util/util_md5.cpp index c11f495f785..0df521c2b58 100644 --- a/intern/cycles/util/util_md5.cpp +++ b/intern/cycles/util/util_md5.cpp @@ -26,8 +26,8 @@ #include "util_md5.h" #include "util_path.h" -#include #include +#include CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index 77293c45f6b..8905c8bc7f0 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "util/util_md5.h" #include "util/util_path.h" +#include "util/util_md5.h" #include "util/util_string.h" #include @@ -36,8 +36,8 @@ OIIO_NAMESPACE_USING # define DIR_SEP '/' # include # include -# include # include +# include #endif #ifdef HAVE_SHLWAPI_H diff --git a/intern/cycles/util/util_profiling.cpp b/intern/cycles/util/util_profiling.cpp index dc5bc35c48d..073b09f719f 100644 --- a/intern/cycles/util/util_profiling.cpp +++ b/intern/cycles/util/util_profiling.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "util/util_profiling.h" #include "util/util_algorithm.h" #include "util/util_foreach.h" -#include "util/util_profiling.h" #include "util/util_set.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h index 23e49b4db7a..26534a29dfe 100644 --- a/intern/cycles/util/util_progress.h +++ b/intern/cycles/util/util_progress.h @@ -25,8 +25,8 @@ #include "util/util_function.h" #include "util/util_string.h" -#include "util/util_time.h" #include "util/util_thread.h" +#include "util/util_time.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_sky_model.cpp b/intern/cycles/util/util_sky_model.cpp index 4a6a9f32607..8cdad8a90a4 100644 --- a/intern/cycles/util/util_sky_model.cpp +++ b/intern/cycles/util/util_sky_model.cpp @@ -101,9 +101,9 @@ All instructions on how to use this code are in the accompanying header file. #include "util/util_sky_model_data.h" #include +#include #include #include -#include CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_string.h b/intern/cycles/util/util_string.h index f71145741c9..ce2d4acdde4 100644 --- a/intern/cycles/util/util_string.h +++ b/intern/cycles/util/util_string.h @@ -17,9 +17,9 @@ #ifndef __UTIL_STRING_H__ #define __UTIL_STRING_H__ +#include #include #include -#include #include "util/util_vector.h" diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp index f700f9bd277..6d32153209a 100644 --- a/intern/cycles/util/util_system.cpp +++ b/intern/cycles/util/util_system.cpp @@ -17,8 +17,8 @@ #include "util/util_system.h" #include "util/util_logging.h" -#include "util/util_types.h" #include "util/util_string.h" +#include "util/util_types.h" #include @@ -35,8 +35,8 @@ OIIO_NAMESPACE_USING # include # include #else -# include # include +# include #endif CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp index 24286116dfb..61aa28c6815 100644 --- a/intern/cycles/util/util_task.cpp +++ b/intern/cycles/util/util_task.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "util/util_task.h" #include "util/util_foreach.h" #include "util/util_logging.h" #include "util/util_system.h" -#include "util/util_task.h" #include "util/util_time.h" //#define THREADING_DEBUG_ENABLED diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h index 18ec5b32144..f6dbc9186b8 100644 --- a/intern/cycles/util/util_thread.h +++ b/intern/cycles/util/util_thread.h @@ -17,11 +17,11 @@ #ifndef __UTIL_THREAD_H__ #define __UTIL_THREAD_H__ -#include -#include #include #include +#include #include +#include #ifdef _WIN32 # include "util_windows.h" diff --git a/intern/cycles/util/util_transform.cpp b/intern/cycles/util/util_transform.cpp index 302a8a386ac..101122740d7 100644 --- a/intern/cycles/util/util_transform.cpp +++ b/intern/cycles/util/util_transform.cpp @@ -46,8 +46,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "util/util_projection.h" #include "util/util_transform.h" +#include "util/util_projection.h" #include "util/util_boundbox.h" #include "util/util_math.h" diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 8a1890ad319..f6535848480 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -153,8 +153,8 @@ CCL_NAMESPACE_END /* SSE types. */ #ifndef __KERNEL_GPU__ # include "util/util_sseb.h" -# include "util/util_ssei.h" # include "util/util_ssef.h" +# include "util/util_ssei.h" # if defined(__KERNEL_AVX__) || defined(__KERNEL_AVX2__) # include "util/util_avxb.h" # include "util/util_avxf.h" -- cgit v1.2.3