diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-03-06 16:15:21 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-06 16:44:42 +0300 |
commit | c8ac760c590aee184aba3a0fbd8110d0aad2fe97 (patch) | |
tree | 9480848f1c4f8f233681cb0311ee12b8a9a34af5 /intern/cycles/kernel/osl | |
parent | 4102d67d32ad2d8411d1ef15e80d3373f36e262b (diff) |
Cleanup: tweak Cycles #includes in preparation for clang-format sorting
Diffstat (limited to 'intern/cycles/kernel/osl')
-rw-r--r-- | intern/cycles/kernel/osl/background.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/bsdf_phong_ramp.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/emissive.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/osl_bssrdf.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/osl_closures.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 2 |
8 files changed, 16 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/background.cpp b/intern/cycles/kernel/osl/background.cpp index b395227845d..3f9de5ab33d 100644 --- a/intern/cycles/kernel/osl/background.cpp +++ b/intern/cycles/kernel/osl/background.cpp @@ -36,9 +36,11 @@ #include "kernel/osl/osl_closures.h" +// clang-format off #include "kernel/kernel_compat_cpu.h" #include "kernel/closure/alloc.h" #include "kernel/closure/emissive.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp index c5edc7c9be3..76a2e41abfa 100644 --- a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp +++ b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp @@ -37,10 +37,12 @@ #include "kernel/kernel_compat_cpu.h" #include "kernel/osl/osl_closures.h" +// clang-format off #include "kernel/kernel_types.h" #include "kernel/kernel_montecarlo.h" #include "kernel/closure/alloc.h" #include "kernel/closure/bsdf_diffuse_ramp.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp index 4b7e59ff932..b78dc8a3a67 100644 --- a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp +++ b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp @@ -37,9 +37,11 @@ #include "kernel/kernel_compat_cpu.h" #include "kernel/osl/osl_closures.h" +// clang-format off #include "kernel/kernel_types.h" #include "kernel/closure/alloc.h" #include "kernel/closure/bsdf_phong_ramp.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/emissive.cpp b/intern/cycles/kernel/osl/emissive.cpp index c29ddb13e2e..d656723bac2 100644 --- a/intern/cycles/kernel/osl/emissive.cpp +++ b/intern/cycles/kernel/osl/emissive.cpp @@ -36,10 +36,12 @@ #include "kernel/osl/osl_closures.h" +// clang-format off #include "kernel/kernel_compat_cpu.h" #include "kernel/kernel_types.h" #include "kernel/closure/alloc.h" #include "kernel/closure/emissive.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_bssrdf.cpp b/intern/cycles/kernel/osl/osl_bssrdf.cpp index dd52c33071c..c5ca8616fbd 100644 --- a/intern/cycles/kernel/osl/osl_bssrdf.cpp +++ b/intern/cycles/kernel/osl/osl_bssrdf.cpp @@ -35,6 +35,7 @@ #include "kernel/kernel_compat_cpu.h" #include "kernel/osl/osl_closures.h" +// clang-format off #include "kernel/kernel_types.h" #include "kernel/kernel_montecarlo.h" @@ -43,6 +44,7 @@ #include "kernel/closure/bsdf_diffuse.h" #include "kernel/closure/bsdf_principled_diffuse.h" #include "kernel/closure/bssrdf.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index 463a65f21a0..ea5e00ec23c 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -39,6 +39,7 @@ #include "util/util_math.h" #include "util/util_param.h" +// clang-format off #include "kernel/kernel_types.h" #include "kernel/kernel_compat_cpu.h" #include "kernel/split/kernel_split_data_types.h" @@ -63,6 +64,7 @@ #include "kernel/closure/bsdf_principled_diffuse.h" #include "kernel/closure/bsdf_principled_sheen.h" #include "kernel/closure/volume.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 767bd7702ae..4354226ba06 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -39,6 +39,7 @@ #include "util/util_logging.h" #include "util/util_string.h" +// clang-format off #include "kernel/kernel_compat_cpu.h" #include "kernel/split/kernel_split_data_types.h" #include "kernel/kernel_globals.h" @@ -56,6 +57,7 @@ #include "kernel/kernel_projection.h" #include "kernel/kernel_accumulate.h" #include "kernel/kernel_shader.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index 0994bfaf950..2318813949e 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -16,6 +16,7 @@ #include <OSL/oslexec.h> +// clang-format off #include "kernel/kernel_compat_cpu.h" #include "kernel/kernel_montecarlo.h" #include "kernel/kernel_types.h" @@ -28,6 +29,7 @@ #include "kernel/osl/osl_globals.h" #include "kernel/osl/osl_services.h" #include "kernel/osl/osl_shader.h" +// clang-format on #include "util/util_foreach.h" |