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

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Jacques Lucke
2024-07-14 11:46:12 +02:00
parent 649fa05bcb 0afee246ea
commit 50e2ea82a7
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,6 +362,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;
@@ -390,12 +398,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");

2
source/blender/nodes/geometry/nodes/node_geo_viewport_transform.cc
View File

@@ -26,7 +26,7 @@ static void node_geo_exec(GeoNodeExecParams params)
const Object &self_object = *params.self_object();
const GeoNodesOperatorData &data = *params.user_data()->call_data->operator_data;
params.set_output("Projection", data.viewport_winmat * self_object.object_to_world());
params.set_output("Projection", data.viewport_winmat);
params.set_output("View", data.viewport_viewmat * self_object.object_to_world());
params.set_output("Is Orthographic", !data.viewport_is_perspective);
}