[Bf-blender-cvs] [c3048b5f53a] soc-2018-hair-shader: Fix typo with Chiang's roughness modifier

[L. E. Segovia]

Commit: c3048b5f53aaeb5b860bf1760a7f1ef51f6c4701
Author: L. E. Segovia
Date:   Thu May 31 12:39:42 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rBc3048b5f53aaeb5b860bf1760a7f1ef51f6c4701

Fix typo with Chiang's roughness modifier

Ty nirved on IRC for noticing

Ref T54796

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

M	intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
M	intern/cycles/kernel/shaders/stdosl.h
M	intern/cycles/render/nodes.cpp
M	intern/cycles/render/nodes.h
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 1668f0bf102..3b142b516bc 100644
--- a/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
@@ -27,7 +27,7 @@ shader node_principled_hair_bsdf(
 	float Offset = 0,
 	float RoughnessU = 0.2,
 	float RoughnessV = 0.2,
-	float PrimaryRefractionRoughness = 1.0,
+	float PrimaryReflectionRoughness = 1.0,
 	float IOR = 1.55,
 
 	output closure color BSDF = 0)
@@ -51,5 +51,5 @@ shader node_principled_hair_bsdf(
 
 	//printf("Info: color %f, incoming normal %f, parametrization %s, resulting sigma %f, Longitudinal %f, Azimuthal %f, Scale deviation %f, IOR %f\n", Color, Normal, parametrization, Sigma, RoughnessU, RoughnessV, Offset, IOR);
 
-	BSDF = principled_hair(Normal, Sigma, RoughnessU, RoughnessV, PrimaryRefractionRoughness, Offset, IOR);
+	BSDF = principled_hair(Normal, Sigma, RoughnessU, RoughnessV, PrimaryReflectionRoughness, Offset, IOR);
 }
diff --git a/intern/cycles/kernel/shaders/stdosl.h b/intern/cycles/kernel/shaders/stdosl.h
index 055443a1e4c..3a6343bc368 100644
--- a/intern/cycles/kernel/shaders/stdosl.h
+++ b/intern/cycles/kernel/shaders/stdosl.h
@@ -554,7 +554,7 @@ closure color bssrdf(string method, normal N, vector radius, color albedo) BUILT
 // Hair
 closure color hair_reflection(normal N, float roughnessu, float roughnessv, vector T, float offset) BUILTIN;
 closure color hair_transmission(normal N, float roughnessu, float roughnessv, vector T, float offset) BUILTIN;
-closure color principled_hair(normal N, color sigma, float roughnessu, float roughnessv, float primary_refraction_roughness, float alpha, float eta) BUILTIN;
+closure color principled_hair(normal N, color sigma, float roughnessu, float roughnessv, float primary_reflection_roughness, float alpha, float eta) BUILTIN;
 
 // Volume
 closure color henyey_greenstein(float g) BUILTIN;
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index a1ea8393ded..c6a57de271b 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_refraction_roughness, "PrimaryRefractionRoughness", 1.0f);
+	SOCKET_IN_FLOAT(primary_reflection_roughness, "PrimaryReflectionRoughness", 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_refraction_roughness_in = input("PrimaryRefractionRoughness");
+	ShaderInput *primary_reflection_roughness_in = input("PrimaryReflectionRoughness");
 	ShaderInput *ior_in = input("IOR");
 
 	int color_ofs = compiler.stack_assign(input("Color"));
@@ -3099,8 +3099,8 @@ void PrincipledHairBsdfNode::compile(SVMCompiler& compiler)
 		__float_as_int(offset),
 		__float_as_int(ior));
 
-    compiler.add_node(compiler.stack_assign_if_linked(primary_refraction_roughness_in),
-		__float_as_int(primary_refraction_roughness),
+    compiler.add_node(compiler.stack_assign_if_linked(primary_reflection_roughness_in),
+		__float_as_int(primary_reflection_roughness),
 		SVM_STACK_INVALID,
 		SVM_STACK_INVALID);
 }
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 047c6b1a864..4e55855b3a1 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -608,7 +608,7 @@ public:
 
     float roughness_u;
     float roughness_v;
-    float primary_refraction_roughness;
+    float primary_reflection_roughness;
     float ior;
     float offset;
     float3 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 495065f22b6..3c411674df8 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_("PrimaryRefractionRoughness"),	1.0f, 0.0f, 0.0f, 0.0f, 10.0f, PROP_FACTOR},
+	{	SOCK_FLOAT,	1, N_("PrimaryReflectionRoughness"),	1.0f, 0.0f, 0.0f, 0.0f, 10.0f, PROP_FACTOR},
 	{	SOCK_FLOAT, 1, N_("IOR"),							1.55f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
 	{	-1, 0, ""	},
 };