diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-08 16:48:54 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-08 16:58:01 +0300 |
| commit | 116be3deffc087a61cdab452cd17bcaaf049a508 (patch) | |
| tree | e7b9aac44d60162586f7e20d7fa9231f41c16013 /intern/cycles/kernel | |
| parent | 406f36f5742468fe57aed9ba5537c59faa6d079a (diff) | |
Fix build on 32bit after Embree changes.
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 7bc9855a807..14d5ff29bd8 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -1411,20 +1411,23 @@ typedef enum KernelBVHLayout { } KernelBVHLayout; typedef struct KernelBVH { - /* root node */ + /* Own BVH */ int root; int have_motion; int have_curves; int have_instancing; int bvh_layout; int use_bvh_steps; - int pad1; + + /* Embree */ #ifdef __EMBREE__ RTCScene scene; +# ifndef __KERNEL_64_BIT__ + int pad1; +# endif #else - void *unused; + int pad1, pad2; #endif - int pad2, pad3; } KernelBVH; static_assert_align(KernelBVH, 16); |