From 7c0a0bae79bb8f842a575fe83975c6d34d73c64a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 1 Dec 2012 19:15:05 +0000 Subject: 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. --- intern/cycles/kernel/kernel_types.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'intern/cycles/kernel/kernel_types.h') 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 { -- cgit v1.2.3