blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Merge branch 'blender-v2.91-release'

This commit is contained in:
Brecht Van Lommel 2020-11-16 19:30:37 +01:00
parent 07bd8eab97 457d537fe4
commit 5d13cb5c2a
2 changed files with 16 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

@ -2791,7 +2791,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");
@ -2807,6 +2807,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) {
@ -2824,6 +2834,7 @@ void PrincipledBsdfNode::expand(ShaderGraph *graph)
}
remove_input(emission_in);
remove_input(emission_strength_in);
remove_input(alpha_in);
}

4
intern/cycles/render/volume.cpp
View File

@ -285,6 +285,10 @@ void VolumeMeshBuilder::create_mesh(vector<float3> &vertices,
vector<int3> vertices_is;
vector<QuadData> quads;
/* make sure we only have leaf nodes in the tree, as tiles are not handled by
* this algorithm */
topology_grid->tree().voxelizeActiveTiles();
generate_vertices_and_quads(vertices_is, quads);
convert_object_space(vertices_is, vertices, face_overlap_avoidance);