diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-20 15:20:24 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-20 15:20:24 +0300 |
commit | de4dcda545e80a09fdc4ad61091eb303e4a22e6f (patch) | |
tree | 1003c32dbc626147fbba37c815698d57530060f0 | |
parent | 51b0ae8a85dbb47963f24fe3d79de878092cc6cc (diff) |
Fix T43651: New pointiness attribute doesn't work with displacement
Simple fix: just make pointiness aware of bump offset.
-rw-r--r-- | intern/cycles/kernel/shaders/node_geometry.osl | 6 | ||||
-rw-r--r-- | intern/cycles/render/nodes.cpp | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_geometry.osl b/intern/cycles/kernel/shaders/node_geometry.osl index 2bbaaff2133..b0bd7692489 100644 --- a/intern/cycles/kernel/shaders/node_geometry.osl +++ b/intern/cycles/kernel/shaders/node_geometry.osl @@ -60,5 +60,11 @@ shader node_geometry( } getattribute("geom:pointiness", Pointiness); + if (bump_offset == "dx") { + Pointiness += Dx(Pointiness); + } + else if (bump_offset == "dy") { + Pointiness += Dy(Pointiness); + } } diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 46c962b16c3..e82dd540ccd 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -2242,8 +2242,15 @@ void GeometryNode::compile(SVMCompiler& compiler) out = output("Pointiness"); if(!out->links.empty()) { + NodeType attr_node = NODE_ATTR; + if(bump == SHADER_BUMP_DX) { + attr_node = NODE_ATTR_BUMP_DX; + } + else if(bump == SHADER_BUMP_DY) { + attr_node = NODE_ATTR_BUMP_DY; + } compiler.stack_assign(out); - compiler.add_node(NODE_ATTR, + compiler.add_node(attr_node, ATTR_STD_POINTINESS, out->stack_offset, NODE_ATTR_FLOAT); |