[Bf-blender-cvs] [116be3deffc] master: Fix build on 32bit after Embree changes.
Brecht Van Lommel
noreply at git.blender.org
Thu Nov 8 15:09:07 CET 2018
Commit: 116be3deffc087a61cdab452cd17bcaaf049a508
Author: Brecht Van Lommel
Date: Thu Nov 8 14:48:54 2018 +0100
Branches: master
https://developer.blender.org/rB116be3deffc087a61cdab452cd17bcaaf049a508
Fix build on 32bit after Embree changes.
===================================================================
M intern/cycles/kernel/kernel_types.h
===================================================================
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);
More information about the Bf-blender-cvs
mailing list