diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-03 16:09:09 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-03 16:09:09 +0400 |
| commit | bf25f1ea96d01b513907cf3067e8e2dd3c7e41b4 (patch) | |
| tree | 822c28fa6ecf5e08c051e5eb7a05f6bc6e2e8742 /intern/cycles/bvh/bvh.h | |
| parent | 57cf48e7c6fd04f864072c21433a822907774f78 (diff) | |
Cycles Hair: refactoring to store curves with the index of the first key and the
number of keys in the curve, rather than curve segments with the indices of two
keys. ShaderData.segment now stores the segment number in the curve.
Diffstat (limited to 'intern/cycles/bvh/bvh.h')
| -rw-r--r-- | intern/cycles/bvh/bvh.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h index d81bb312148..00c146143b8 100644 --- a/intern/cycles/bvh/bvh.h +++ b/intern/cycles/bvh/bvh.h @@ -53,7 +53,7 @@ struct PackedBVH { /* precomputed triangle intersection data, one triangle is 4x float4 */ array<float4> tri_woop; /* primitive type - triangle or strand (should be moved to flag?) */ - array<int> prim_type; + array<int> prim_segment; /* visibility visibilitys for primitives */ array<uint> prim_visibility; /* mapping from BVH primitive index to true primitive index, as primitives @@ -106,7 +106,7 @@ protected: /* triangles and strands*/ void pack_primitives(); void pack_triangle(int idx, float4 woop[3]); - void pack_curve_seg(int idx, float4 woop[3]); + void pack_curve_segment(int idx, float4 woop[3]); /* merge instance BVH's */ void pack_instances(size_t nodes_size); |