diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2021-10-30 22:37:05 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2021-10-30 22:37:05 +0300 |
| commit | e9bbfd0c8c7a508d220bf355722ff03f91e93183 (patch) | |
| tree | 1230f26bc82f24547aeccbaa7fcd6d3db2655fd3 /intern/cycles/bvh/bvh2.cpp | |
| parent | 1aa953bd1913c81b22c80a00edbf4ad88a32c52f (diff) | |
| parent | 03a962d8cab44221650f59eb223cb0a767e05b2b (diff) | |
Merge branch 'master' into soc-2020-io-performancesoc-2020-io-performance
Diffstat (limited to 'intern/cycles/bvh/bvh2.cpp')
| -rw-r--r-- | intern/cycles/bvh/bvh2.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/bvh/bvh2.cpp b/intern/cycles/bvh/bvh2.cpp index 4a90a1e8796..04290602145 100644 --- a/intern/cycles/bvh/bvh2.cpp +++ b/intern/cycles/bvh/bvh2.cpp @@ -17,16 +17,16 @@ #include "bvh/bvh2.h" -#include "render/hair.h" -#include "render/mesh.h" -#include "render/object.h" +#include "scene/hair.h" +#include "scene/mesh.h" +#include "scene/object.h" -#include "bvh/bvh_build.h" -#include "bvh/bvh_node.h" -#include "bvh/bvh_unaligned.h" +#include "bvh/build.h" +#include "bvh/node.h" +#include "bvh/unaligned.h" -#include "util/util_foreach.h" -#include "util/util_progress.h" +#include "util/foreach.h" +#include "util/progress.h" CCL_NAMESPACE_BEGIN |