diff options
| author | Stuart Broadfoot <gbroadfoot@hotmail.com> | 2013-01-15 23:44:41 +0400 |
|---|---|---|
| committer | Stuart Broadfoot <gbroadfoot@hotmail.com> | 2013-01-15 23:44:41 +0400 |
| commit | 3373b8154b16d345b0e1fcbdb55d03d8ec088006 (patch) | |
| tree | eec2b36ebf0f70ca882a26e6525839c9f7f2013a /intern/cycles/kernel/kernel_types.h | |
| parent | 0967b39be1cf9644454e1d4e9c6d0250d9a36e85 (diff) | |
Cycles Hair: Introduction of Cardinal Spline Curve Segments and minor fixes.
The curve segment primitive has been added. This includes an intersection function and changes to the BVH.
A few small errors in the line segment intersection routine are also fixed.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 83c157b1f36..ce37b54f215 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -700,6 +700,7 @@ typedef enum CurveFlag { CURVE_KN_NORMALCORRECTION = 128, /* correct tangent normal for slope? */ CURVE_KN_TRUETANGENTGNORMAL = 256, /* use tangent normal for geometry? */ CURVE_KN_TANGENTGNORMAL = 512, /* use tangent normal for shader? */ + CURVE_KN_RIBBONS = 1024, /* use flat curve ribbons */ } CurveFlag; typedef struct KernelCurves { @@ -707,7 +708,7 @@ typedef struct KernelCurves { float normalmix; float encasing_ratio; int curveflags; - int pad; + int subdivisions; } KernelCurves; |