Commit: 257a7701e04db99bd5c9def75729dc07042bcb47
Author: L. E. Segovia
Date: Mon Jun 4 22:10:59 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB257a7701e04db99bd5c9def75729dc07042bcb47
Apologies, I didn't complete the defaults properly!
Ref T54796
===================================================================
M intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
M intern/cycles/render/nodes.cpp
M source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.c
===================================================================
diff --git a/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
b/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
index 17bb43b22a6..e5c2e52d2a6 100644
--- a/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
@@ -22,8 +22,8 @@ color log3 (color a) {
shader node_principled_hair_bsdf(
color Color = 0.8,
- float Melanin = 1.3,
- float MelaninRedness = 0.0,
+ float Melanin = 0.0,
+ float MelaninRedness = 1.3,
color AbsorptionCoefficient = color(0.245531, 0.52, 1.365),
normal Normal = Ng,
string parametrization = "Absorption coefficient",
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 25141bea38d..5d722001dc2 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -3043,9 +3043,9 @@ NODE_DEFINE(PrincipledHairBsdfNode)
NodeType* type = NodeType::add("principled_hair_bsdf", create,
NodeType::SHADER);
SOCKET_IN_COLOR(color, "Color", make_float3(0.8f, 0.8f, 0.8f));
- SOCKET_IN_FLOAT(eumelanin, "Melanin", 1.3f);
- SOCKET_IN_FLOAT(pheomelanin, "Melanin Redness", 0.0f);
- SOCKET_IN_VECTOR(absorption_coefficient, "Absorption Coefficient",
1.3f*make_float3(0.187f, 0.4f, 1.05f), SocketType::VECTOR);
+ SOCKET_IN_FLOAT(eumelanin, "Melanin", 0.0f);
+ SOCKET_IN_FLOAT(pheomelanin, "Melanin Redness", 1.3f);
+ SOCKET_IN_VECTOR(absorption_coefficient, "Absorption Coefficient",
make_float3(0.245531f, 0.52f, 1.365f), SocketType::VECTOR);
SOCKET_IN_NORMAL(normal, "Normal", make_float3(0.0f, 0.0f, 0.0f),
SocketType::LINK_NORMAL);
SOCKET_IN_FLOAT(surface_mix_weight, "SurfaceMixWeight", 0.0f,
SocketType::SVM_INTERNAL);
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 be3c67a5d26..346589f1b7d 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
@@ -31,8 +31,8 @@
static bNodeSocketTemplate sh_node_bsdf_hair_principled_in[] = {
{ SOCK_RGBA, 1, N_("Color"),
0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
- { SOCK_FLOAT, 1, N_("Melanin"),
1.3f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
- { SOCK_FLOAT, 1, N_("Melanin Redness"),
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
+ { SOCK_FLOAT, 1, N_("Melanin"),
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
+ { SOCK_FLOAT, 1, N_("Melanin Redness"),
1.3f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
// Benedikt Bitterli's default brownish hair with PHEOmelanin
// The absorption coefficient below is 1.3f * pheomelanin mapping
{ SOCK_VECTOR, 1, N_("Absorption Coefficient"),
0.245531f, 0.52f, 1.365f, 0.0f, 0.0f, 1000.0f},
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
