[Bf-blender-cvs] [7d324c74cd2] soc-2018-hair-shader: Cleanup: formatting

[L. E. Segovia]

Commit: 7d324c74cd2b46833759a4c99af5be755fd984a2
Author: L. E. Segovia
Date:   Tue Jun 5 01:10:06 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB7d324c74cd2b46833759a4c99af5be755fd984a2

Cleanup: formatting

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

M	intern/cycles/kernel/svm/svm_closure.h
M	intern/cycles/render/nodes.cpp
M	source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.c

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

diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index 2807de3b2b6..3f287433e8b 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -772,7 +772,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 					case NODE_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION: {
 						float3 melanin_sigma = eumelanin*make_float3(0.419f, 0.697f, 1.37f) + pheomelanin*make_float3(0.187f, 0.4f, 1.05f);
 						float roughness_fac = (((((0.245f*param2) + 5.574f)*param2 - 10.73f)*param2 + 2.532f)*param2 - 0.215f)*param2 + 5.969f;
-						float3 tint_sigma =  log3(tint)/roughness_fac;
+						float3 tint_sigma = log3(tint)/roughness_fac;
 						tint_sigma *= tint_sigma;
 						bsdf->sigma = melanin_sigma + tint_sigma;
 						break;
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 64dddfafcda..8529b14aa3e 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -3118,14 +3118,14 @@ void PrincipledHairBsdfNode::compile(SVMCompiler& compiler)
 		__float_as_int(pheomelanin));
 	
 	compiler.add_node(
-	  compiler.encode_uchar4(
-		 tint_ofs,
-		 SVM_STACK_INVALID,
-		 SVM_STACK_INVALID,
-		 SVM_STACK_INVALID),
-	  SVM_STACK_INVALID,
-	  SVM_STACK_INVALID,
-	  SVM_STACK_INVALID);
+		compiler.encode_uchar4(
+			tint_ofs,
+			SVM_STACK_INVALID,
+			SVM_STACK_INVALID,
+			SVM_STACK_INVALID),
+		SVM_STACK_INVALID,
+		SVM_STACK_INVALID,
+		SVM_STACK_INVALID);
 }
 
 void PrincipledHairBsdfNode::compile(OSLCompiler& compiler)
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 0800646de41..81117398747 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,18 +30,18 @@
 /* **************** 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},
-	{	SOCK_FLOAT,  1, N_("Melanin"),						0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
-	{	SOCK_FLOAT,  1, N_("Melanin Redness"),				1.3f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
-	{   SOCK_RGBA,   1, N_("Tint"),                         1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA,		1, N_("Color"),							0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT,		1, N_("Melanin"),						0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
+	{	SOCK_FLOAT,		1, N_("Melanin Redness"),				1.3f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
+	{	SOCK_RGBA,		1, N_("Tint"),							1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
 	// Benedikt Bitterli's default brownish hair with PHEOmelanin
 	// The absorption coefficient below is 1.3f * pheomelanin mapping
-	{	SOCK_VECTOR, 1, N_("Absorption Coefficient"),		0.245531f, 0.52f, 1.365f, 0.0f, 0.0f, 1000.0f},
-	{	SOCK_FLOAT,  1, N_("Offset"),						2.f*M_PI/180.f, 0.0f, 0.0f, 0.0f, -M_PI_2, M_PI_2, PROP_ANGLE},
-	{	SOCK_FLOAT,  1, N_("RoughnessU"),					0.3f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_FLOAT,  1, N_("RoughnessV"),					0.3f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_FLOAT,  1, N_("Primary Reflection Roughness"),	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_FLOAT,  1, N_("IOR"),							1.55f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+	{	SOCK_VECTOR,	1, N_("Absorption Coefficient"),		0.245531f, 0.52f, 1.365f, 0.0f, 0.0f, 1000.0f},
+	{	SOCK_FLOAT,		1, N_("Offset"),						2.f*M_PI/180.f, 0.0f, 0.0f, 0.0f, -M_PI_2, M_PI_2, PROP_ANGLE},
+	{	SOCK_FLOAT,		1, N_("RoughnessU"),					0.3f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_FLOAT,		1, N_("RoughnessV"),					0.3f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_FLOAT,		1, N_("Primary Reflection Roughness"),	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_FLOAT,		1, N_("IOR"),							1.55f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
 	{	-1, 0, ""	},
 };
 
@@ -77,7 +77,7 @@ static void node_shader_update_hair_principled(bNodeTree *UNUSED(ntree), bNode *
 				sock->flag |= SOCK_UNAVAIL;
 			}
 		}
-		else if (STREQ(sock->name, "Melanin Redness"))  {
+		else if (STREQ(sock->name, "Melanin Redness")) {
 			if (parametrization == SHD_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION){
 				sock->flag &= ~SOCK_UNAVAIL;
 			}
@@ -85,7 +85,7 @@ static void node_shader_update_hair_principled(bNodeTree *UNUSED(ntree), bNode *
 				sock->flag |= SOCK_UNAVAIL;
 			}
 		}
-		else if (STREQ(sock->name, "Tint"))  {
+		else if (STREQ(sock->name, "Tint")) {
 			if (parametrization == SHD_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION){
 				sock->flag &= ~SOCK_UNAVAIL;
 			}