diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-08 13:02:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-08 13:02:54 +0300 |
| commit | 712f7c36402bd9b195d9e32dd72552e3dfc9ca24 (patch) | |
| tree | a82b0406475a2934ef6b21e430eb9fe65a34e1f9 /intern/cycles/kernel/osl | |
| parent | ef7c36f5edf00bad99d5897758d780ae48cde6f3 (diff) | |
Cycles: Make it possible to access KernelGlobals from split data initialization function
Diffstat (limited to 'intern/cycles/kernel/osl')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_closures.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index 4cb46254bc7..fe61587d179 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -42,7 +42,7 @@ #include "kernel_types.h" #include "kernel_compat_cpu.h" -#include "split/kernel_split_data.h" +#include "split/kernel_split_data_types.h" #include "kernel_globals.h" #include "kernel_montecarlo.h" #include "kernel_random.h" diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 2d5b9c1c1cc..b08353e82d1 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -39,7 +39,7 @@ #include "util_string.h" #include "kernel_compat_cpu.h" -#include "split/kernel_split_data.h" +#include "split/kernel_split_data_types.h" #include "kernel_globals.h" #include "kernel_random.h" #include "kernel_projection.h" diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index 78848d7dfc9..c7e9f57b18a 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -19,7 +19,7 @@ #include "kernel_compat_cpu.h" #include "kernel_montecarlo.h" #include "kernel_types.h" -#include "split/kernel_split_data.h" +#include "split/kernel_split_data_types.h" #include "kernel_globals.h" #include "geom/geom_object.h" |