Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: tentative fix get rid of os-specific issue in struct ShaderClosure ( aligment issues due order )

Browse Source
This commit is contained in:
Jens Verwiebe
2014-09-15 21:20:24 +02:00
parent 03ce9882af
commit 0c3ff81e79
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/kernel_types.h
View File

@@ -531,16 +531,18 @@ typedef enum AttributeStandard {
typedef struct ShaderClosure { typedef struct ShaderClosure {
ClosureType type; ClosureType type;
float3 weight; float3 weight;
#ifndef __APPLE__
float sample_weight;
#endif
float data0; float data0;
float data1; float data1;
float data2; float data2;
float3 N; float3 N;
float3 T; float3 T;
#ifdef __APPLE__
float sample_weight; float sample_weight;
#endif
#ifdef __OSL__ #ifdef __OSL__
void *prim; void *prim;
#endif #endif