diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:03 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:58 +0300 |
| commit | 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch) | |
| tree | ec50d7bdca3901a6afcc986943011f08f9516307 /intern/cycles/bvh | |
| parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) | |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'intern/cycles/bvh')
| -rw-r--r-- | intern/cycles/bvh/bvh_build.cpp | 6 | ||||
| -rw-r--r-- | intern/cycles/bvh/bvh_embree.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/bvh/bvh_optix.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
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 <embree3/rtcore_geometry.h> # include <pmmintrin.h> # include <xmmintrin.h> -# include <embree3/rtcore_geometry.h> # 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" |