diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-10-24 15:19:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-26 16:36:39 +0300 |
| commit | d7d40745fa09061a3117bd3669c5a46bbf611eae (patch) | |
| tree | 8dbaca086ecbb09aad62c25e9ece66332fe79af3 /intern/cycles/kernel/device/optix/globals.h | |
| parent | b698fe1e047e56e8ed67ba47464c0017d9c50eea (diff) | |
Cycles: changes to source code folders structure
* Split render/ into scene/ and session/. The scene/ folder now contains the
scene and its nodes. The session/ folder contains the render session and
associated data structures like drivers and render buffers.
* Move top level kernel headers into new folders kernel/camera/, kernel/film/,
kernel/light/, kernel/sample/, kernel/util/
* Move integrator related kernel headers into kernel/integrator/
* Move OSL shaders from kernel/shaders/ to kernel/osl/shaders/
For patches and branches, git merge and rebase should be able to detect the
renames and move over code to the right file.
Diffstat (limited to 'intern/cycles/kernel/device/optix/globals.h')
| -rw-r--r-- | intern/cycles/kernel/device/optix/globals.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/device/optix/globals.h b/intern/cycles/kernel/device/optix/globals.h index 7b8ebfe50e6..e038bc1797a 100644 --- a/intern/cycles/kernel/device/optix/globals.h +++ b/intern/cycles/kernel/device/optix/globals.h @@ -18,11 +18,12 @@ #pragma once -#include "kernel/kernel_profiling.h" #include "kernel/kernel_types.h" #include "kernel/integrator/integrator_state.h" +#include "kernel/util/util_profiling.h" + CCL_NAMESPACE_BEGIN /* Not actually used, just a NULL pointer that gets passed everywhere, which we |