diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-16 01:12:58 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-16 01:12:58 +0400 |
| commit | fe16b2620646708bae3286b9c1300eacbc4bc0da (patch) | |
| tree | 5c3b225d1e23f3797cca638649f014662031825e /intern/cycles/kernel/kernel_types.h | |
| parent | 8a25e2d2b2214db32b1a337253f337b63eafdef3 (diff) | |
Cycles: fix some update issues with camera motion blur, and do some more work
for getting object motion blur ready.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index be49aa54e47..2acea04838a 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -113,7 +113,6 @@ CCL_NAMESPACE_BEGIN #endif //#define __SOBOL_FULL_SCREEN__ -//#define __QBVH__ /* Shader Evaluation */ @@ -428,13 +427,6 @@ typedef struct ShaderData { /* length of the ray being shaded */ float ray_length; -#ifdef __OBJECT_MOTION__ - /* object <-> world space transformations, cached to avoid - * re-interpolating them constantly for shading */ - Transform ob_tfm; - Transform ob_itfm; -#endif - #ifdef __RAY_DIFFERENTIALS__ /* differential of P. these are orthogonal to Ng, not N */ differential3 dP; @@ -453,6 +445,13 @@ typedef struct ShaderData { float3 T; #endif +#ifdef __OBJECT_MOTION__ + /* object <-> world space transformations, cached to avoid + * re-interpolating them constantly for shading */ + Transform ob_tfm; + Transform ob_itfm; +#endif + #ifdef __MULTI_CLOSURE__ /* Closure data, we store a fixed array of closures */ ShaderClosure closure[MAX_CLOSURE]; @@ -632,7 +631,8 @@ typedef struct KernelBVH { /* root node */ int root; int attributes_map_stride; - int pad1, pad2; + int have_motion; + int pad2; } KernelBVH; typedef struct KernelData { |