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/device/cpu/kernel_thread_globals.cpp | |
| parent | 1aa953bd1913c81b22c80a00edbf4ad88a32c52f (diff) | |
| parent | 03a962d8cab44221650f59eb223cb0a767e05b2b (diff) | |
Merge branch 'master' into soc-2020-io-performancesoc-2020-io-performance
Diffstat (limited to 'intern/cycles/device/cpu/kernel_thread_globals.cpp')
| -rw-r--r-- | intern/cycles/device/cpu/kernel_thread_globals.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/cpu/kernel_thread_globals.cpp b/intern/cycles/device/cpu/kernel_thread_globals.cpp index 44735beb88d..739b6460318 100644 --- a/intern/cycles/device/cpu/kernel_thread_globals.cpp +++ b/intern/cycles/device/cpu/kernel_thread_globals.cpp @@ -17,11 +17,11 @@ #include "device/cpu/kernel_thread_globals.h" // clang-format off -#include "kernel/osl/osl_shader.h" -#include "kernel/osl/osl_globals.h" +#include "kernel/osl/shader.h" +#include "kernel/osl/globals.h" // clang-format on -#include "util/util_profiling.h" +#include "util/profiling.h" CCL_NAMESPACE_BEGIN |