diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-09 20:38:15 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-09 20:38:15 +0400 |
| commit | 71c9120d044de3a859fda2d6b490fa3c249ec786 (patch) | |
| tree | e09c84f08254e06a5d8da6c119b071a484227b6b /intern/cycles/kernel/kernel_types.h | |
| parent | cfbd6cf154bbc653422f30b2bf8077545f5fb99c (diff) | |
Cycles: fix windows build, some minor tweaks.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 93cd61c43ca..1417f2d5110 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -80,7 +80,9 @@ enum PathRayFlag { PATH_RAY_DIFFUSE = 16, PATH_RAY_GLOSSY = 32, PATH_RAY_SINGULAR = 64, - PATH_RAY_TRANSPARENT = 128 + PATH_RAY_TRANSPARENT = 128, + + PATH_RAY_ALL = (1|2|4|8|16|32|64|128) }; /* Bidirectional Path Tracing */ @@ -248,7 +250,6 @@ typedef struct ShaderData { float3 svm_closure_weight; float svm_closure_data0; float svm_closure_data1; - float svm_closure_data2; #if !defined(__KERNEL_GPU__) && defined(WITH_OSL) /* OSL closure data and context. we store all closures flattened into |