From 116be3deffc087a61cdab452cd17bcaaf049a508 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Thu, 8 Nov 2018 14:48:54 +0100
Subject: Fix build on 32bit after Embree changes.

---
 intern/cycles/kernel/kernel_types.h | 11 +++++++----
 1 file 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);
 
-- 
cgit v1.2.3