[Bf-blender-cvs] [f7f08886355] microfacet_hair: Renaming R lobe to Reflection

[Weizhen Huang]

Commit: f7f088863553c9b0b0d190d3220350d777355d48
Author: Weizhen Huang
Date:   Wed Jan 11 18:42:52 2023 +0100
Branches: microfacet_hair
https://developer.blender.org/rBf7f088863553c9b0b0d190d3220350d777355d48

Renaming R lobe to Reflection

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

M	intern/cycles/scene/shader_nodes.cpp
M	source/blender/nodes/shader/nodes/node_shader_bsdf_hair_microfacet.cc

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

diff --git a/intern/cycles/scene/shader_nodes.cpp b/intern/cycles/scene/shader_nodes.cpp
index 8ebca2bc406..e130a51bc4b 100644
--- a/intern/cycles/scene/shader_nodes.cpp
+++ b/intern/cycles/scene/shader_nodes.cpp
@@ -3676,9 +3676,9 @@ NODE_DEFINE(MicrofacetHairBsdfNode)
   SOCKET_IN_FLOAT(roughness, "Roughness", 0.3f);
   SOCKET_IN_FLOAT(ior, "IOR", 1.55f);
 
-  SOCKET_IN_FLOAT(R, "R lobe", 1.0f);
-  SOCKET_IN_FLOAT(TT, "TT lobe", 1.0f);
-  SOCKET_IN_FLOAT(TRT, "TRT lobe", 1.0f);
+  SOCKET_IN_FLOAT(R, "Reflection", 1.0f);
+  SOCKET_IN_FLOAT(TT, "Transmission", 1.0f);
+  SOCKET_IN_FLOAT(TRT, "Secondary Reflection", 1.0f);
 
   SOCKET_IN_FLOAT(Blur, "Blur", 1.0f);
 
@@ -3727,9 +3727,9 @@ void MicrofacetHairBsdfNode::compile(SVMCompiler &compiler)
   ShaderInput *melanin_redness_in = input("Melanin Redness");
   ShaderInput *random_color_in = input("Random Color");
 
-  ShaderInput *R_in = input("R lobe");
-  ShaderInput *TT_in = input("TT lobe");
-  ShaderInput *TRT_in = input("TRT lobe");
+  ShaderInput *R_in = input("Reflection");
+  ShaderInput *TT_in = input("Transmission");
+  ShaderInput *TRT_in = input("Secondary Reflection");
   ShaderInput *Blur_in = input("Blur");
 
   ShaderInput *aspect_ratio_in = input("Aspect Ratio");
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_microfacet.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_microfacet.cc
index e6ebebb359f..8a7cbed08eb 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_microfacet.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_microfacet.cc
@@ -37,17 +37,17 @@ static void node_declare(NodeDeclarationBuilder &b)
       .min(0.0f)
       .max(1.0f)
       .subtype(PROP_FACTOR);
-  b.add_input<decl::Float>(N_("R lobe"))
+  b.add_input<decl::Float>(N_("Reflection"))
       .default_value(1.0f)
       .min(0.0f)
       .max(1.0f)
       .subtype(PROP_FACTOR);
-  b.add_input<decl::Float>(N_("TT lobe"))
+  b.add_input<decl::Float>(N_("Transmission"))
       .default_value(1.0f)
       .min(0.0f)
       .max(1.0f)
       .subtype(PROP_FACTOR);
-  b.add_input<decl::Float>(N_("TRT lobe"))
+  b.add_input<decl::Float>(N_("Secondary Reflection"))
       .default_value(1.0f)
       .min(0.0f)
       .max(1.0f)