Cycles: De-duplicate utility functions in ccl::Graph

This commit is contained in:
2015-12-15 20:04:00 +05:00
parent 669fdca681
commit baaf10cb26
3 changed files with 10 additions and 36 deletions

View File

@@ -96,10 +96,11 @@ ShaderNode::~ShaderNode()
ShaderInput *ShaderNode::input(const char *name)
{
foreach(ShaderInput *socket, inputs)
foreach(ShaderInput *socket, inputs) {
if(strcmp(socket->name, name) == 0)
return socket;
}
assert(!"Requested shader input does not exist");
return NULL;
}
@@ -108,7 +109,7 @@ ShaderOutput *ShaderNode::output(const char *name)
foreach(ShaderOutput *socket, outputs)
if(strcmp(socket->name, name) == 0)
return socket;
assert(!"Requested shader output does not exist");
return NULL;
}
@@ -145,30 +146,6 @@ ShaderOutput *ShaderNode::add_output(const char *name, ShaderSocketType type)
return output;
}
ShaderInput *ShaderNode::get_input(const char *name)
{
foreach(ShaderInput *input, inputs) {
if(strcmp(input->name, name) == 0)
return input;
}
/* Should never happen. */
assert(!"No Shader Input!");
return NULL;
}
ShaderOutput *ShaderNode::get_output(const char *name)
{
foreach(ShaderOutput *output, outputs) {
if(strcmp(output->name, name) == 0)
return output;
}
/* Should never happen. */
assert(!"No Shader Output!");
return NULL;
}
void ShaderNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
foreach(ShaderInput *input, inputs) {