diff options
author | Thomas Dinges <blender@dingto.org> | 2013-08-19 02:25:37 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-08-19 02:25:37 +0400 |
commit | 676b019846c67d22f92e9496222c771e314c66bb (patch) | |
tree | 3eefdcba019c4c70f05f3e4d449957f1a534211d | |
parent | 8080c10c32fd2638495891e8b8b75d4fb23c8fd8 (diff) |
Cycles:
* Fix 16 byte alignment for constant hair kernel data.
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index d98356c2e55..78724d71ffa 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -804,19 +804,20 @@ typedef enum CurveFlag { CURVE_KN_POSTINTERSECTCORRECTION = 32, /* correct for width after intersect? */ CURVE_KN_TRUETANGENTGNORMAL = 64, /* use tangent normal for geometry? */ CURVE_KN_TANGENTGNORMAL = 128, /* use tangent normal for shader? */ - CURVE_KN_RIBBONS = 256, /* use flat curve ribbons */ + CURVE_KN_RIBBONS = 256, /* use flat curve ribbons */ } CurveFlag; typedef struct KernelCurves { - /* strand intersect and normal parameters - many can be changed to flags*/ + /* strand intersect and normal parameters - many can be changed to flags */ float encasing_ratio; int curveflags; int subdivisions; + int pad1; float minimum_width; float maximum_width; float curve_epsilon; - int pad1; + int pad2; } KernelCurves; typedef struct KernelBSSRDF { |