diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:45 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:45 +0400 |
| commit | 84470a1190b28cd37491e5002aea4695e4f26f44 (patch) | |
| tree | 82f78b632fdfc30ac7b7e54101dea7f0257621b4 /intern/cycles/kernel/osl | |
| parent | 2100fb4094800a1cbe4e11c530d4eec3019a87a5 (diff) | |
Cycles code refactor: move geometry related kernel files into own directory.
Diffstat (limited to 'intern/cycles/kernel/osl')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 9 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 58858c3766e..a25d2fe03b5 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -30,14 +30,13 @@ #include "kernel_compat_cpu.h" #include "kernel_globals.h" +#include "kernel_random.h" + +#include "geom/geom_bvh.h" + #include "kernel_montecarlo.h" #include "kernel_projection.h" #include "kernel_differential.h" -#include "kernel_object.h" -#include "kernel_random.h" -#include "kernel_bvh.h" -#include "kernel_triangle.h" -#include "kernel_curve.h" #include "kernel_primitive.h" #include "kernel_projection.h" #include "kernel_accumulate.h" diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index 554f647df7c..34d9ebefdb3 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -18,7 +18,8 @@ #include "kernel_montecarlo.h" #include "kernel_types.h" #include "kernel_globals.h" -#include "kernel_object.h" + +#include "geom/geom_object.h" #include "closure/bsdf_diffuse.h" #include "closure/bssrdf.h" |