diff options
| author | Thomas Dinges <blender@dingto.org> | 2015-02-21 14:55:19 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2015-02-21 14:55:19 +0300 |
| commit | 7bd4c78a1aef1c71b8b0e121fd6ae62f2b35fd83 (patch) | |
| tree | cc5debb3e087a366b4055502967e559335b5f52c /intern | |
| parent | 913e109f14d0d5164aa6f58e846de63f575cdf11 (diff) | |
Cleanup: Put all Bump dx/dy code in the beginning here, same as with other nodes.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index e82dd540ccd..fa6ffffd9b4 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -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, |