Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-10-30 13:39:44 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-10-30 13:39:44 +0300
commit7c0d37deca32512ff38120bf1736160110fe97cb (patch)
treebffec280f2a65e1e3d58379d5d3b5e2b68c07c7f
parent4205cd269dfdace8ab2d3e1cc8363be19979ce53 (diff)
Fix build error on Windows 32bit, alignment was wrong.
-rw-r--r--intern/cycles/kernel/kernel_types.h4
1 files changed, 1 insertions, 3 deletions
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;