blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix T82673: Cycles crash with zero emission strength and linked emission color

This commit is contained in:
Brecht Van Lommel 2020-11-16 19:28:58 +01:00
parent 13ec512f4b
commit 457d537fe4
Notes: blender-bot 2023-02-14 07:30:31 +01:00 
Referenced by issue #82673, Crash with Blackbody node in Base Color and Emission Color input
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/render/nodes.cpp
View File

@ -2785,7 +2785,7 @@ void PrincipledBsdfNode::expand(ShaderGraph *graph)
ShaderInput *emission_strength_in = input("Emission Strength");
if ((emission_in->link || emission != make_float3(0.0f, 0.0f, 0.0f)) &&
(emission_strength_in->link || emission_strength != 0.0f)) {
/* Create add closure and emission. */
/* Create add closure and emission, and relink inputs. */
AddClosureNode *add = graph->create_node<AddClosureNode>();
EmissionNode *emission_node = graph->create_node<EmissionNode>();
ShaderOutput *new_out = add->output("Closure");
@ -2801,6 +2801,16 @@ void PrincipledBsdfNode::expand(ShaderGraph *graph)
principled_out = new_out;
}
else {
/* Disconnect unused links if the other value is zero, required before
* we remove the input from the node entirely. */
if (emission_in->link) {
emission_in->disconnect();
}
if (emission_strength_in->link) {
emission_strength_in->disconnect();
}
}
ShaderInput *alpha_in = input("Alpha");
if (alpha_in->link || alpha != 1.0f) {
@ -2818,6 +2828,7 @@ void PrincipledBsdfNode::expand(ShaderGraph *graph)
}
remove_input(emission_in);
remove_input(emission_strength_in);
remove_input(alpha_in);
}