diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-03 17:18:35 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-03 17:18:35 +0400 |
| commit | e1004eb13949f27b98302e7ad71335c8dd22f1a8 (patch) | |
| tree | dd980d193e81b5973407cbc47e6734a9d1ae1c79 /intern/cycles/kernel/svm/svm_attribute.h | |
| parent | b3f21a22548db7e8e77001065b9139c44a8e0c62 (diff) | |
Fix CUDA build error after last commit, and remove some comments.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_attribute.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_attribute.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/svm/svm_attribute.h b/intern/cycles/kernel/svm/svm_attribute.h index ea0a31610f1..2beec995151 100644 --- a/intern/cycles/kernel/svm/svm_attribute.h +++ b/intern/cycles/kernel/svm/svm_attribute.h @@ -28,7 +28,9 @@ __device void svm_node_attr_init(KernelGlobals *kg, ShaderData *sd, /* find attribute by unique id */ uint id = node.y; uint attr_offset = sd->object*kernel_data.bvh.attributes_map_stride; +#ifdef __HAIR__ attr_offset = (sd->segment == ~0)? attr_offset: attr_offset + ATTR_PRIM_CURVE; +#endif uint4 attr_map = kernel_tex_fetch(__attributes_map, attr_offset); while(attr_map.x != id) { |