archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: Connect value inputs to Strength instead of Color when inserting an Emission node

Browse Source 
Same result, but saves an additional ConvertNode.
This commit is contained in:
Lukas Stockner
2018-06-14 22:16:42 +02:00
parent 716e138a1b
commit 064e701472
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/render/graph.cpp
View File

@@ -243,18 +243,27 @@ void ShaderGraph::connect(ShaderOutput *from, ShaderInput *to)
/* add automatic conversion node in case of type mismatch */
ShaderNode *convert;
ShaderInput *convert_in;
if (to->type() == SocketType::CLOSURE) {
EmissionNode *emission = new EmissionNode();
emission->color = make_float3(1.0f, 1.0f, 1.0f);
emission->strength = 1.0f;
convert = add(emission);
/* Connect float inputs to Strength to save an additional Falue->Color conversion. */
if(from->type() == SocketType::FLOAT) {
convert_in = convert->input("Strength");
}
else {
convert_in = convert->input("Color");
}
}
else {
convert = add(new ConvertNode(from->type(), to->type(), true));
convert_in = convert->inputs[0];
}
connect(from, convert->inputs[0]);
connect(from, convert_in);
connect(convert->outputs[0], to);
}
else {