[Bf-blender-cvs] [58d7bc2ce64] soc-2018-hair-shader: Fix: set a default brown for Direct coloring

[L. E. Segovia]

Commit: 58d7bc2ce6435fac7b49a0abaf847e4d02e4b1df
Author: L. E. Segovia
Date:   Mon Jul 9 01:14:37 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB58d7bc2ce6435fac7b49a0abaf847e4d02e4b1df

Fix: set a default brown for Direct coloring

===================================================================

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 5ea31c7bd5c..084dde53f25 100644
--- a/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
@@ -21,7 +21,7 @@ color log3 (color a) {
 }
 
 shader node_principled_hair_bsdf(
-	color Color = 0.8,
+	color Color = color(0.09292, 0.02100, 0.00417),
 	float Melanin = 0.0,
 	float MelaninRedness = 1.3,
 	float ColorRandomization = 0.0,
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index f1137ed6e53..fce73fcc5b5 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -3068,7 +3068,7 @@ NODE_DEFINE(PrincipledHairBsdfNode)
 	NodeType* type = NodeType::add("principled_hair_bsdf", create, NodeType::SHADER);
 
 	// Initialize all sockets to their default values.
-	SOCKET_IN_COLOR(color, "Color", make_float3(0.8f, 0.8f, 0.8f));
+	SOCKET_IN_COLOR(color, "Color", make_float3(0.09292f, 0.02100f, 0.00417f));
 	SOCKET_IN_FLOAT(melanin, "Melanin", 1.3f);
 	SOCKET_IN_FLOAT(melanin_redness, "Melanin Redness", 1.0f);
 	SOCKET_IN_COLOR(tint, "Tint", make_float3(1.f, 1.f, 1.f));
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 d047cd685ec..2df8520d6e6 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
@@ -30,7 +30,8 @@
 /* **************** OUTPUT ******************** */
 
 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},
+	// This value was chosen empirically from rendering Bitterli's hair
+	{	SOCK_RGBA,		1, N_("Color"),						0.09292f, 0.02100f, 0.00417f, 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"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{	SOCK_RGBA,		1, N_("Tint"),						1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},