[Bf-blender-cvs] [7c0d37deca3] master: Fix build error on Windows 32bit, alignment was wrong.

Brecht Van Lommel noreply at git.blender.org
Tue Oct 30 11:55:14 CET 2018


Commit: 7c0d37deca32512ff38120bf1736160110fe97cb
Author: Brecht Van Lommel
Date:   Tue Oct 30 11:39:44 2018 +0100
Branches: master
https://developer.blender.org/rB7c0d37deca32512ff38120bf1736160110fe97cb

Fix build error on Windows 32bit, alignment was wrong.

===================================================================

M	intern/cycles/kernel/kernel_types.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index f46b06f87f9..230e90c8b31 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -1278,13 +1278,11 @@ typedef struct KernelFilm {
 	float mist_start;
 	float mist_inv_depth;
 	float mist_falloff;
-	
+
 	int pass_denoising_data;
 	int pass_denoising_clean;
 	int denoising_flags;
 
-	int pad1, pad2;
-
 	/* XYZ to rendering color space transform. float4 instead of float3 to
 	 * ensure consistent padding/alignment across devices. */
 	float4 xyz_to_r;



More information about the Bf-blender-cvs mailing list