diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2015-04-06 16:37:12 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2015-04-06 16:37:12 +0300 |
commit | 3519a9f5179132251d60cd7660e8b257f41de76d (patch) | |
tree | be6b81d2c439249af96b8b28b5013dcbb735b937 /intern/cycles/render/nodes.cpp | |
parent | bdf398daa805cc233d5cdf1a08bf6f71f0d5f994 (diff) | |
parent | 74df307ca43df14b759fd9eb6a049a6c5d90dcda (diff) |
Merge remote-tracking branch 'origin/master' into multiviewmultiview
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
-rw-r--r-- | intern/cycles/render/nodes.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index a62634efa42..40bb82c6330 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -2248,10 +2248,15 @@ void GeometryNode::compile(SVMCompiler& compiler) out = output("Pointiness"); if(!out->links.empty()) { compiler.stack_assign(out); - compiler.add_node(attr_node, - ATTR_STD_POINTINESS, - out->stack_offset, - NODE_ATTR_FLOAT); + if(compiler.output_type() != SHADER_TYPE_VOLUME) { + compiler.add_node(attr_node, + ATTR_STD_POINTINESS, + out->stack_offset, + NODE_ATTR_FLOAT); + } + else { + compiler.add_node(NODE_VALUE_F, __float_as_int(0.0f), out->stack_offset); + } } } |