diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-05 21:08:56 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-05 21:08:56 +0400 |
| commit | 674d295df3931f3ebbfa5bca549bf000c1abe362 (patch) | |
| tree | 91ef3ac7c934c19a219560d542c4de69aa06587b /intern/cycles/render/mesh.cpp | |
| parent | c1dc3753790038d94dd088923f0bb7f97e5ed6f9 (diff) | |
Fix for attribute lookup in OSL. This uses a map in the OSL globals instead of the device texture.
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 8f5f2647ebf..1d9683f25cc 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 = ustring(string("std::") + attribute_standard_name(req.std).c_str()); og->attribute_map[i][stdname] = osl_attr; } else if(req.name != ustring()) { |