diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-12 17:13:56 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-12 17:13:56 +0400 |
| commit | ebc653463ddfd9f8b893b6acbcc6465972e6abc6 (patch) | |
| tree | 6b3cc2ba3f04994cf9f8d8f5bca6d63cfe2c9d1f /intern/cycles/kernel/kernel_globals.h | |
| parent | c40492205b4369de3babe63b43d127ca622773ec (diff) | |
Cycles:
* Fix missing update when editing objects with emission materials.
* Fix preview pass rendering set to 1 not showing full resolution.
* Fix CUDA runtime compiling failing due to missing cache directory.
* Use settings from first render layer for visibility and material override.
And a bunch of incomplete and still disabled code mostly related to closure
sampling.
Diffstat (limited to 'intern/cycles/kernel/kernel_globals.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_globals.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h index f37b27cc9f4..a1b23128b38 100644 --- a/intern/cycles/kernel/kernel_globals.h +++ b/intern/cycles/kernel/kernel_globals.h @@ -20,7 +20,7 @@ #ifdef __KERNEL_CPU__ -#ifdef WITH_OSL +#ifdef __OSL__ #include "osl_globals.h" #endif @@ -43,7 +43,7 @@ typedef struct KernelGlobals { KernelData __data; -#ifdef WITH_OSL +#ifdef __OSL__ /* On the CPU, we also have the OSL globals here. Most data structures are shared with SVM, the difference is in the shaders and object/mesh attributes. */ OSLGlobals osl; |