[Bf-blender-cvs] [9973c2c26f3] soc-2018-hair-shader: Clarify one of the parameters
L. E. Segovia
noreply at git.blender.org
Sat Jun 2 20:05:44 CEST 2018
Commit: 9973c2c26f3554660546dd3452ae1234f447a00b
Author: L. E. Segovia
Date: Sat Jun 2 15:27:04 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB9973c2c26f3554660546dd3452ae1234f447a00b
Clarify one of the parameters
(RoughnessU and RoughnessV are still there because other nodes use them too.)
Ref T54796
===================================================================
M intern/cycles/render/nodes.cpp
M source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.c
===================================================================
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index c6a57de271b..a66499db476 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -3056,7 +3056,7 @@ NODE_DEFINE(PrincipledHairBsdfNode)
SOCKET_IN_FLOAT(offset, "Offset", 0.0f);
SOCKET_IN_FLOAT(roughness_u, "RoughnessU", 0.2f);
SOCKET_IN_FLOAT(roughness_v, "RoughnessV", 0.2f);
- SOCKET_IN_FLOAT(primary_reflection_roughness, "PrimaryReflectionRoughness", 1.0f);
+ SOCKET_IN_FLOAT(primary_reflection_roughness, "Primary Reflection Roughness", 1.0f);
SOCKET_IN_FLOAT(ior, "IOR", 1.55f);
SOCKET_OUT_CLOSURE(BSDF, "BSDF");
@@ -3077,7 +3077,7 @@ void PrincipledHairBsdfNode::compile(SVMCompiler& compiler)
ShaderInput *roughness_u_in = input("RoughnessU");
ShaderInput *roughness_v_in = input("RoughnessV");
ShaderInput *offset_in = input("Offset");
- ShaderInput *primary_reflection_roughness_in = input("PrimaryReflectionRoughness");
+ ShaderInput *primary_reflection_roughness_in = input("Primary Reflection Roughness");
ShaderInput *ior_in = input("IOR");
int color_ofs = compiler.stack_assign(input("Color"));
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.c
index 287d7c39ab4..618e04ed987 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.c
@@ -34,7 +34,7 @@ static bNodeSocketTemplate sh_node_bsdf_hair_principled_in[] = {
{ SOCK_FLOAT, 1, N_("Offset"), 0.0f, 0.0f, 0.0f, 0.0f, -M_PI_2, M_PI_2, PROP_ANGLE},
{ SOCK_FLOAT, 1, N_("RoughnessU"), 0.2f, 0.2f, 0.2f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
{ SOCK_FLOAT, 1, N_("RoughnessV"), 0.2f, 0.2f, 0.2f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
- { SOCK_FLOAT, 1, N_("PrimaryReflectionRoughness"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+ { SOCK_FLOAT, 1, N_("Primary Reflection Roughness"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
{ SOCK_FLOAT, 1, N_("IOR"), 1.55f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
{ -1, 0, "" },
};
More information about the Bf-blender-cvs
mailing list