Cycles code refactor: change curve key to float4 for easier storage as attribute.

1 files changed, 4 insertions, 5 deletions

diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h
index 9c59aca4c72..5ae8f1f6033 100644
--- a/intern/cycles/render/mesh.h
+++ b/intern/cycles/render/mesh.h
@@ -46,6 +46,8 @@ public:
 	/* Mesh Triangle */
 	struct Triangle {
 		int v[3];
+
+		void bounds_grow(const float3 *verts, BoundBox& bounds) const;
 	};
 
 	/* Mesh Curve */
@@ -55,11 +57,8 @@ public:
 		uint shader;
 
 		int num_segments() { return num_keys - 1; }
-	};
 
-	struct CurveKey {
-		float3 co;
-		float radius;
+		void bounds_grow(const int k, const float4 *curve_keys, BoundBox& bounds) const;
 	};
 
 	/* Displacement */
@@ -77,7 +76,7 @@ public:
 	vector<uint> shader;
 	vector<bool> smooth;
 
-	vector<CurveKey> curve_keys;
+	vector<float4> curve_keys; /* co + radius */
 	vector<Curve> curves;
 
 	vector<uint> used_shaders;