[Bf-blender-cvs] [3279ef6cc79] soc-2018-hair-shader: Fix: OSL shader used both the wrong and the unadjusted type of roughness

[L. E. Segovia]

Commit: 3279ef6cc79dcb5d10ea37d7db46f3469fa1cad8
Author: L. E. Segovia
Date:   Sun Jul 8 22:37:24 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB3279ef6cc79dcb5d10ea37d7db46f3469fa1cad8

Fix: OSL shader used both the wrong and the unadjusted type of roughness

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

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 c55b3a8a564..df61988ec53 100644
--- a/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
@@ -64,13 +64,13 @@ shader node_principled_hair_bsdf(
 	}
 	else if (parametrization == "Melanin concentration") {
 		color Melanin_Sigma = AdjustedEumelanin*color(0.419, 0.697, 1.37) + AdjustedPheomelanin*color(0.187, 0.4, 1.05);
-		float roughness_fac = (((((0.245*AdjustedRoughness) + 5.574)*AdjustedRoughness - 10.73)*AdjustedRoughness + 2.532)*AdjustedRoughness - 0.215)*AdjustedRoughness + 5.969;
+		float roughness_fac = (((((0.245*AdjustedRadialRoughness) + 5.574)*AdjustedRadialRoughness - 10.73)*AdjustedRadialRoughness + 2.532)*AdjustedRadialRoughness - 0.215)*AdjustedRadialRoughness + 5.969;
 		color Tint_Sigma = log3(Tint)/roughness_fac;
 		Tint_Sigma *= Tint_Sigma;
 		Sigma = Melanin_Sigma + Tint_Sigma;
 	}
 	else if (parametrization == "Direct coloring"){
-		float roughness_fac = (((((0.245*Roughness) + 5.574)*AdjustedRoughness - 10.73)*AdjustedRoughness + 2.532)*AdjustedRoughness - 0.215)*AdjustedRoughness + 5.969;
+		float roughness_fac = (((((0.245*AdjustedRadialRoughness) + 5.574)*AdjustedRadialRoughness - 10.73)*AdjustedRadialRoughness + 2.532)*AdjustedRadialRoughness - 0.215)*AdjustedRadialRoughness + 5.969;
 		Sigma = log3(Color)/roughness_fac;
 		Sigma *= Sigma;
 	}