diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-01 23:15:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-01 23:15:05 +0400 |
| commit | 7c0a0bae79bb8f842a575fe83975c6d34d73c64a (patch) | |
| tree | 844857e85903601f60a083d767d6317f3006d31f /intern/cycles/kernel/kernel_types.h | |
| parent | 807fd448a557fbacb70fcd9b5cae76529fdb9b80 (diff) | |
Fix #33375: OSL geom:trianglevertices gave wrong coordinates for static BVH.
Also some simple OSL optimization, passing thread data pointer directly instead
of via thread local storage, and creating ustrings for attribute lookup.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index f519fd989fa..e3a766e56b1 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -366,9 +366,6 @@ typedef struct ShaderClosure { float sample_weight; #endif -#ifdef __OSL__ - void *prim; -#endif float data0; float data1; @@ -377,6 +374,9 @@ typedef struct ShaderClosure { float3 T; #endif +#ifdef __OSL__ + void *prim; +#endif } ShaderClosure; /* Shader Data @@ -403,7 +403,8 @@ enum ShaderDataFlag { /* object flags */ SD_HOLDOUT_MASK = 4096, /* holdout for camera rays */ - SD_OBJECT_MOTION = 8192 /* has object motion blur */ + SD_OBJECT_MOTION = 8192, /* has object motion blur */ + SD_TRANSFORM_APPLIED = 16384 /* vertices have transform applied */ }; typedef struct ShaderData { |