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

Merge branch 'blender-v4.0-release' into main

Browse Source
This commit is contained in:
Brecht Van Lommel
2023-10-13 16:34:27 +02:00
parent 1f680c3859 5e67e44963
commit 7f07d5f428
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,7 +619,13 @@ static void version_principled_bsdf_subsurface(bNodeTree *ntree)
bNodeSocket *subsurf = nodeFindSocket(node, SOCK_IN, "Subsurface");
float *subsurf_val = version_cycles_node_socket_float_value(subsurf);
*version_cycles_node_socket_float_value(scale_in) = *subsurf_val;
if (!subsurf->link && *subsurf_val == 0.0f) {
*version_cycles_node_socket_float_value(scale_in) = 0.05f;
}
else {
*version_cycles_node_socket_float_value(scale_in) = *subsurf_val;
}
if (subsurf->link == nullptr && *subsurf_val == 0.0f) {
/* Node doesn't use Subsurf, we're done here. */

2
source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc
View File

@@ -16,7 +16,7 @@ namespace blender::nodes::node_shader_subsurface_scattering_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f});
b.add_input<decl::Float>("Scale").default_value(1.0f).min(0.0f).max(1000.0f);
b.add_input<decl::Float>("Scale").default_value(0.05f).min(0.0f).max(1000.0f);
b.add_input<decl::Vector>("Radius").default_value({1.0f, 0.2f, 0.1f}).min(0.0f).max(100.0f);
b.add_input<decl::Float>("IOR").default_value(1.4f).min(1.01f).max(3.8f).subtype(PROP_FACTOR);
b.add_input<decl::Float>("Anisotropy")