diff options
author | Thomas Dinges <blender@dingto.org> | 2013-05-08 21:33:25 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-05-08 21:33:25 +0400 |
commit | 872a8ed1bf635a62a65d3b2a92b7d2fbb368eea1 (patch) | |
tree | d09aaf49f569515eb3eacb7921ac90f13357657d /intern/cycles/kernel | |
parent | 9037a2d3ab7630b877039244cc71b56d413df893 (diff) |
Cycles / Hair rendering:
* Enable hair rendering on the GPU.
Patch by Stuart Broadfoot, with small tweaks by me, to only enable it on sm_20 and above.
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index fad1ee8f525..ee221db4267 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -51,7 +51,6 @@ CCL_NAMESPACE_BEGIN #define __KERNEL_SHADING__ #define __KERNEL_ADV_SHADING__ #define __NON_PROGRESSIVE__ -#define __HAIR__ #ifdef WITH_OSL #define __OSL__ #endif @@ -125,6 +124,7 @@ CCL_NAMESPACE_BEGIN #define __ANISOTROPIC__ #define __CAMERA_MOTION__ #define __OBJECT_MOTION__ +#define __HAIR__ #endif //#define __SOBOL_FULL_SCREEN__ |