From 3373b8154b16d345b0e1fcbdb55d03d8ec088006 Mon Sep 17 00:00:00 2001
From: Stuart Broadfoot <gbroadfoot@hotmail.com>
Date: Tue, 15 Jan 2013 19:44:41 +0000
Subject: 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.
---
 intern/cycles/kernel/kernel_types.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'intern/cycles/kernel/kernel_types.h')

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;
 
-- 
cgit v1.2.3