[Bf-blender-cvs] [b005c15f673] soc-2018-hair-shader: Amend OSL shader w.r.t. Melanin changes

[L. E. Segovia]

Commit: b005c15f6734ca20816d4820394f09667aaa853b
Author: L. E. Segovia
Date:   Sun Jun 17 01:23:57 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rBb005c15f6734ca20816d4820394f09667aaa853b

Amend OSL shader w.r.t. Melanin changes

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

M	intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl

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

diff --git a/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl b/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
index 715247f77e6..12085b991db 100644
--- a/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
@@ -46,14 +46,14 @@ shader node_principled_hair_bsdf(
 
 	float AdjustedRoughnessU = RoughnessU*factor_random_roughness;
 	float AdjustedRoughnessV = RoughnessV*factor_random_roughness;
-	float AdjustedMelanin = Melanin*factor_random_color;
-	float AdjustedMelaninRedness = MelaninRedness*factor_random_color;
+	float AdjustedEumelanin = Melanin*(1.0-MelaninRedness)*factor_random_color;
+	float AdjustedPheomelanin = Melanin*MelaninRedness*factor_random_color;
 
 	if (parametrization == "Absorption coefficient") {
 		Sigma = AbsorptionCoefficient;
 	}
 	else if (parametrization == "Melanin concentration") {
-		color Melanin_Sigma = AdjustedMelanin*color(0.419, 0.697, 1.37) + AdjustedMelaninRedness*color(0.187, 0.4, 1.05);
+		color Melanin_Sigma = AdjustedEumelanin*color(0.419, 0.697, 1.37) + AdjustedPheomelanin*color(0.187, 0.4, 1.05);
 		float roughness_fac = (((((0.245*AdjustedRoughnessU) + 5.574)*AdjustedRoughnessU - 10.73)*AdjustedRoughnessU + 2.532)*AdjustedRoughnessU - 0.215)*AdjustedRoughnessU + 5.969;
 		color Tint_Sigma = log3(Tint)/roughness_fac;
 		Tint_Sigma *= Tint_Sigma;