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/geom | |
| 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/geom')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_patch.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_primitive.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle_intersect.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/kernel/geom/geom_patch.h b/intern/cycles/kernel/geom/geom_patch.h index bd797ef52ab..bf1a06220aa 100644 --- a/intern/cycles/kernel/geom/geom_patch.h +++ b/intern/cycles/kernel/geom/geom_patch.h @@ -26,6 +26,8 @@ #pragma once +#include "util/util_color.h" + CCL_NAMESPACE_BEGIN typedef struct PatchHandle { diff --git a/intern/cycles/kernel/geom/geom_primitive.h b/intern/cycles/kernel/geom/geom_primitive.h index 91b29c7f990..bc559e3c812 100644 --- a/intern/cycles/kernel/geom/geom_primitive.h +++ b/intern/cycles/kernel/geom/geom_primitive.h @@ -21,7 +21,7 @@ #pragma once -#include "kernel/kernel_projection.h" +#include "kernel/camera/camera_projection.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h index fee629cc75a..440dc23d124 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h @@ -22,7 +22,7 @@ #pragma once -#include "kernel/kernel_random.h" +#include "kernel/sample/sample_lcg.h" CCL_NAMESPACE_BEGIN |