diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-07-17 00:36:31 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-07-17 00:36:52 +0400 |
| commit | 85c7fce3de9821de6e806fe057f762577e01ad06 (patch) | |
| tree | 485753b89489667ea9bb2f14bddfa84c5ee35ff7 /intern | |
| parent | 57a3403bc08d71d851cbded1c08913f0402d994c (diff) | |
Cleanup / Cycles: Remove unused defines and some other minor changes.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index d81909a623a..c35aebe40f7 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -392,10 +392,8 @@ typedef enum LightType { LIGHT_DISTANT, LIGHT_BACKGROUND, LIGHT_AREA, - LIGHT_AO, LIGHT_SPOT, - LIGHT_TRIANGLE, - LIGHT_STRAND + LIGHT_TRIANGLE } LightType; /* Camera Type */ @@ -530,13 +528,11 @@ typedef struct ShaderClosure { float data0; float data1; + float data2; float3 N; -#if defined(__ANISOTROPIC__) || defined(__SUBSURFACE__) || defined(__HAIR__) float3 T; -#endif - float data2; #ifdef __OSL__ void *prim; #endif @@ -927,7 +923,6 @@ typedef enum CurveFlag { } CurveFlag; typedef struct KernelCurves { - /* strand intersect and normal parameters - many can be changed to flags */ int curveflags; int subdivisions; |