diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-03 18:32:13 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-03 18:32:13 +0400 |
| commit | 615fe0295fe13c229d7376b02a50ac110b636c47 (patch) | |
| tree | 490bcc8d4af2abb7eed7679990fbee29a5376fb9 /intern/cycles/render/mesh.cpp | |
| parent | 6b098d7406f7d84b04be8d8604073de4e06613c9 (diff) | |
Cycles OSL: refactoring and fixes
* Moved kernel/osl/nodes to kernel/shaders
* Renamed standard attributes to use geom:, particle:, object: prefixes
* Update stdosl.h to properly reflect the closures we support
* Fix the wrong stdosl.h being used for building shaders
* Add geom:numpolyvertices, geom:trianglevertices, geom:polyvertices attributes
Diffstat (limited to 'intern/cycles/render/mesh.cpp')
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 3c41b4f1ad3..13c06a922cc 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -366,8 +366,8 @@ void MeshManager::update_osl_attributes(Device *device, Scene *scene, vector<Att osl_attr.type = TypeDesc::TypeColor; if(req.std != ATTR_STD_NONE) { - /* if standard attribute, add lookup by std:: name convention */ - ustring stdname(std::string("std::") + std::string(attribute_standard_name(req.std))); + /* if standard attribute, add lookup by geom: name convention */ + ustring stdname(string("geom:") + string(attribute_standard_name(req.std))); og->attribute_map[i][stdname] = osl_attr; } else if(req.name != ustring()) { |