diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-09-15 23:20:24 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-09-15 23:20:24 +0400 |
| commit | 0c3ff81e79ee48d47c15a693004bd66e6aca5123 (patch) | |
| tree | 8d3db4624b8760bdfc8ff6c7156f16dd0cd1fb35 /intern | |
| parent | 03ce9882afa34873a8e3ea0e56d2a9ddc294e607 (diff) | |
Cycles: tentative fix get rid of os-specific issue in struct ShaderClosure ( aligment issues due order )
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 933202ea498..a8c24f090e6 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -531,16 +531,18 @@ typedef enum AttributeStandard { typedef struct ShaderClosure { ClosureType type; float3 weight; - +#ifndef __APPLE__ + float sample_weight; +#endif float data0; float data1; float data2; float3 N; float3 T; - +#ifdef __APPLE__ float sample_weight; - +#endif #ifdef __OSL__ void *prim; #endif |