Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-31 20:30:34 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-31 20:30:34 +0400
commit6b03f92aa7bdb10cfde99bc30a7337c843bda57c (patch)
tree92bafd2a3a44aa2552ee56a836e40acacd2878e5 /intern/cycles/render/graph.cpp
parent9939ec06dd590fa520ab4138e011b0738a2639ea (diff)
Cycles Volume Render: optimization to avoid exporting surface attributes when
only a volume shader is used.
Diffstat (limited to 'intern/cycles/render/graph.cpp')
-rw-r--r--intern/cycles/render/graph.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 023b5db7839..af57470aa89 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -116,7 +116,7 @@ ShaderOutput *ShaderNode::add_output(const char *name, ShaderSocketType type)
return output;
}
-void ShaderNode::attributes(AttributeRequestSet *attributes)
+void ShaderNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
foreach(ShaderInput *input, inputs) {
if(!input->link) {
@@ -151,9 +151,9 @@ ShaderNode *ShaderGraph::add(ShaderNode *node)
return node;
}
-ShaderNode *ShaderGraph::output()
+OutputNode *ShaderGraph::output()
{
- return nodes.front();
+ return (OutputNode*)nodes.front();
}
ShaderGraph *ShaderGraph::copy()