Merge branch 'blender-v4.0-release' into main
This commit is contained in:
commit
b1b0d7757a
|
@ -348,7 +348,7 @@ void Shader::tag_update(Scene *scene)
|
|||
has_volume = has_volume || output->input("Volume")->link;
|
||||
has_displacement = has_displacement || output->input("Displacement")->link;
|
||||
|
||||
if (!has_surface) {
|
||||
if (!has_surface && !has_volume) {
|
||||
/* If we need to output surface AOVs, add a Transparent BSDF so that the
|
||||
* surface shader runs. */
|
||||
foreach (ShaderNode *node, graph->nodes) {
|
||||
|
|
|
@ -798,7 +798,7 @@ void SVMCompiler::compile_type(Shader *shader, ShaderGraph *graph, ShaderType ty
|
|||
switch (type) {
|
||||
case SHADER_TYPE_SURFACE: /* generate surface shader */
|
||||
find_aov_nodes_and_dependencies(state.aov_nodes, graph, &state);
|
||||
if (clin->link || state.aov_nodes.size() > 0) {
|
||||
if (clin->link) {
|
||||
shader->has_surface = true;
|
||||
state.node_feature_mask = KERNEL_FEATURE_NODE_MASK_SURFACE;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue