kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: Put all Bump dx/dy code in the beginning here, same as with other nodes.

Browse Source
This commit is contained in:
Thomas Dinges 2015-02-21 12:55:19 +01:00
parent 913e109f14
commit 7bd4c78a1a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2192,11 +2192,16 @@ void GeometryNode::compile(SVMCompiler& compiler)
{
ShaderOutput *out;
NodeType geom_node = NODE_GEOMETRY;
NodeType attr_node = NODE_ATTR;
if(bump == SHADER_BUMP_DX)
if(bump == SHADER_BUMP_DX) {
geom_node = NODE_GEOMETRY_BUMP_DX;
else if(bump == SHADER_BUMP_DY)
attr_node = NODE_ATTR_BUMP_DX;
}
else if(bump == SHADER_BUMP_DY) {
geom_node = NODE_GEOMETRY_BUMP_DY;
attr_node = NODE_ATTR_BUMP_DY;
}
out = output("Position");
if(!out->links.empty()) {
@ -2242,13 +2247,6 @@ 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(attr_node,
ATTR_STD_POINTINESS,