diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 16:27:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 16:27:10 +0300 |
| commit | 5f22de843953131d4c114644867b8e6fde508ca2 (patch) | |
| tree | 87327784141392fb3372ff0fda981106361f953e /intern | |
| parent | 88a80fcec8672b5bb67041456dc7f7101aae3d55 (diff) | |
| parent | 165caafb99c6846e53d11c4e966990aaffc06cea (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/graph/node_enum.h | 3 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/intern/cycles/graph/node_enum.h b/intern/cycles/graph/node_enum.h index 9de776ddb55..705aec9a918 100644 --- a/intern/cycles/graph/node_enum.h +++ b/intern/cycles/graph/node_enum.h @@ -39,6 +39,9 @@ struct NodeEnum { int operator[](ustring x) const { return left.find(x)->second; } ustring operator[](int y) const { return right.find(y)->second; } + unordered_map<ustring, int, ustringHash>::const_iterator begin() const { return left.begin(); } + unordered_map<ustring, int, ustringHash>::const_iterator end() const { return left.end(); } + private: unordered_map<ustring, int, ustringHash> left; unordered_map<int, ustring> right; diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 4af0d8663e8..727cbe243ac 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -3732,7 +3732,7 @@ void LightPathNode::compile(OSLCompiler& compiler) NODE_DEFINE(LightFalloffNode) { - NodeType* type = NodeType::add("light_fallof", create, NodeType::SHADER); + NodeType* type = NodeType::add("light_falloff", create, NodeType::SHADER); SOCKET_IN_FLOAT(strength, "Strength", 100.0f); SOCKET_IN_FLOAT(smooth, "Smooth", 0.0f); @@ -5840,7 +5840,7 @@ NODE_DEFINE(NormalMapNode) space_enum.insert("world", NODE_NORMAL_MAP_WORLD); space_enum.insert("blender_object", NODE_NORMAL_MAP_BLENDER_OBJECT); space_enum.insert("blender_world", NODE_NORMAL_MAP_BLENDER_WORLD); - SOCKET_ENUM(space, "Space", space_enum, NODE_TANGENT_RADIAL); + SOCKET_ENUM(space, "Space", space_enum, NODE_NORMAL_MAP_TANGENT); SOCKET_STRING(attribute, "Attribute", ustring()); @@ -6051,7 +6051,7 @@ NODE_DEFINE(DisplacementNode) space_enum.insert("object", NODE_NORMAL_MAP_OBJECT); space_enum.insert("world", NODE_NORMAL_MAP_WORLD); - SOCKET_ENUM(space, "Space", space_enum, NODE_NORMAL_MAP_TANGENT); + SOCKET_ENUM(space, "Space", space_enum, NODE_NORMAL_MAP_OBJECT); SOCKET_IN_FLOAT(height, "Height", 0.0f); SOCKET_IN_FLOAT(midlevel, "Midlevel", 0.5f); |