diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-07 15:06:45 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-07 15:06:45 +0400 |
| commit | a9105a7deaccbd98c4e994d8f0f041bef4179bfa (patch) | |
| tree | fc7fcebc23cdd2f580b32c7c629198497c6531ef /intern/cycles/render/mesh.cpp | |
| parent | 8b6046cdad1325a82e0d161fdca0118e62f36b2d (diff) | |
Fix for Cycles (CUDA) compilation (again ...). Moved the AttributeStandard enum typedef and the attribute_standard_name mapping function to util_attribute/util_types headers, so they can properly be used by kernel and render files alike. This should avoid any std C includes which are not available in CUDA. Thanks to Sergey for help!
Diffstat (limited to 'intern/cycles/render/mesh.cpp')
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 1d9683f25cc..7037e36f313 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -366,7 +366,7 @@ void MeshManager::update_osl_attributes(Device *device, Scene *scene, vector<Att if(req.std != ATTR_STD_NONE) { /* if standard attribute, add lookup by std:: name convention */ - ustring stdname = ustring(string("std::") + attribute_standard_name(req.std).c_str()); + ustring stdname(std::string("std::") + std::string(attribute_standard_name(req.std))); og->attribute_map[i][stdname] = osl_attr; } else if(req.name != ustring()) { |