Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T43651: New pointiness attribute doesn't work with displacement

Browse Source 
Simple fix: just make pointiness aware of bump offset.
This commit is contained in:
Sergey Sharybin
2015-02-20 17:20:24 +05:00
parent 51b0ae8a85
commit de4dcda545
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/shaders/node_geometry.osl
View File

@@ -60,5 +60,11 @@ shader node_geometry(
} }
getattribute("geom:pointiness", Pointiness); getattribute("geom:pointiness", Pointiness);
if (bump_offset == "dx") {
Pointiness += Dx(Pointiness);
}
else if (bump_offset == "dy") {
Pointiness += Dy(Pointiness);
}
} }

9
intern/cycles/render/nodes.cpp
View File

@@ -2242,8 +2242,15 @@ void GeometryNode::compile(SVMCompiler& compiler)
out = output("Pointiness"); out = output("Pointiness");
if(!out->links.empty()) { 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.stack_assign(out);
compiler.add_node(NODE_ATTR, compiler.add_node(attr_node,
ATTR_STD_POINTINESS, ATTR_STD_POINTINESS,
out->stack_offset, out->stack_offset,
NODE_ATTR_FLOAT); NODE_ATTR_FLOAT);