griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #124593: Reorder EEVEE material shadow versioning

Browse Source 
Caused by 983e4a7543

Bail out case should be at the top

Pull Request: https://projects.blender.org/blender/blender/pulls/124600
This commit is contained in:
Alaska
2024-07-12 22:44:01 +02:00
committed by Clément Foucault
parent 40c25eaa03
commit 0afee246ea
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenloader/intern/versioning_400.cc
View File

@@ -359,6 +359,14 @@ static void versioning_eevee_material_shadow_none(Material *material)
return;
}
bNodeSocket *existing_out_sock = blender::bke::nodeFindSocket(output_node, SOCK_IN, "Surface");
bNodeSocket *volume_sock = blender::bke::nodeFindSocket(output_node, SOCK_IN, "Volume");
if (existing_out_sock->link == nullptr && volume_sock->link) {
/* Don't apply versioning to a material that only has a volumetric input as this makes the
* object surface opaque to the camera, hiding the volume inside. */
return;
}
if (output_node->custom1 == SHD_OUTPUT_ALL) {
/* We do not want to affect Cycles. So we split the output into two specific outputs. */
output_node->custom1 = SHD_OUTPUT_CYCLES;
@@ -387,12 +395,6 @@ static void versioning_eevee_material_shadow_none(Material *material)
}
bNodeSocket *out_sock = blender::bke::nodeFindSocket(output_node, SOCK_IN, "Surface");
bNodeSocket *volume_sock = blender::bke::nodeFindSocket(output_node, SOCK_IN, "Volume");
if (out_sock->link == nullptr && volume_sock->link) {
/* Don't apply versioning to a material that only has a volumetric input as this makes the
* object surface opaque to the camera, hiding the volume inside. */
return;
}
bNode *mix_node = blender::bke::nodeAddNode(nullptr, ntree, "ShaderNodeMixShader");
STRNCPY(mix_node->label, "Disable Shadow");