Updates for the Cycle Hair UI. With the following changes

- Removed the cycles subdivision and interpolation of hairkeys.
- Removed the parent settings.
- Removed all of the advanced settings and presets.
- This simplifies the UI to a few settings for the primitive type and a shape mode.

1 files changed, 6 insertions, 8 deletions

diff --git a/intern/cycles/render/curves.h b/intern/cycles/render/curves.h
index 42f0498617e..088702d39ed 100644
--- a/intern/cycles/render/curves.h
+++ b/intern/cycles/render/curves.h
@@ -48,9 +48,13 @@ typedef enum curve_primitives {
 	CURVE_RIBBONS
 } curve_primitives;
 
+typedef enum curve_shape {
+	CURVE_RIBBON,
+	CURVE_THICK
+} curve_shape;
+
 typedef enum curve_triangles {
 	CURVE_CAMERA_TRIANGLES,
-	CURVE_RIBBON_TRIANGLES,
 	CURVE_TESSELATED_TRIANGLES
 } curve_triangles;
 
@@ -99,27 +103,21 @@ class CurveSystemManager {
 public:
 
 	int primitive;
+	int curve_shape;
 	int line_method;
-	int interpolation;
 	int triangle_method;
 	int resolution;
-	int segments;
 	int subdivisions;
 
-	float normalmix;
 	float encasing_ratio;
 	float minimum_width;
 	float maximum_width;
 
 	bool use_curves;
-	bool use_smooth;
-	bool use_parents;
 	bool use_encasing;
 	bool use_backfacing;
 	bool use_tangent_normal;
-	bool use_tangent_normal_correction;
 	bool use_tangent_normal_geometry;
-	bool use_joined;
 
 	bool need_update;
 	bool need_mesh_update;