diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:46 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:46 +0400 |
| commit | 0509553b5eb240b3970848a4432e0bbfcbba8690 (patch) | |
| tree | dd0d7281e3f88ba22aacb6543f0d3000f4c2ed74 /intern/cycles/kernel/osl/osl_shader.cpp | |
| parent | 24ad7e0bea77d942267344990d22e931610c3d07 (diff) | |
Cycles code refactor: changes to make adding new primitive types easier.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_shader.cpp')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index 34d9ebefdb3..b5842d1013e 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -536,7 +536,7 @@ int OSLShader::find_attribute(KernelGlobals *kg, const ShaderData *sd, uint id, /* for OSL, a hash map is used to lookup the attribute by name. */ int object = sd->object*ATTR_PRIM_TYPES; #ifdef __HAIR__ - if(sd->segment != ~0) object += ATTR_PRIM_CURVE; + if(sd->type & PRIMITIVE_ALL_CURVE) object += ATTR_PRIM_CURVE; #endif OSLGlobals::AttributeMap &attr_map = kg->osl->attribute_map[object]; |