[Bf-blender-cvs] [08f3536d17f] soc-2018-hair-shader: Fix double casting error in Linux

L. E. Segovia noreply at git.blender.org
Wed Jun 6 16:34:06 CEST 2018


Commit: 08f3536d17ffe1c5a877d752b4d4a823ac73f11b
Author: L. E. Segovia
Date:   Wed Jun 6 14:33:49 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB08f3536d17ffe1c5a877d752b4d4a823ac73f11b

Fix double casting error in Linux

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

M	intern/cycles/render/nodes.cpp
M	source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.c

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

diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 8e0cd122b3d..5e652310c32 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -3058,7 +3058,7 @@ NODE_DEFINE(PrincipledHairBsdfNode)
 	parametrization_enum.insert("Melanin concentration", NODE_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION);
 	SOCKET_ENUM(parametrization, "Parametrization", parametrization_enum, NODE_PRINCIPLED_HAIR_REFLECTANCE);
 
-	SOCKET_IN_FLOAT(offset, "Offset", 2.f*M_PI/180.f);
+	SOCKET_IN_FLOAT(offset, "Offset", 2.f*((float)M_PI)/180.f);
 	SOCKET_IN_FLOAT(roughness_u, "RoughnessU", 0.3f);
 	SOCKET_IN_FLOAT(roughness_v, "RoughnessV", 0.3f);
 	SOCKET_IN_FLOAT(roughness_randomization, "Roughness Randomization", 0.0f);
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 ef5a06fd1ed..95e80f31adb 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
@@ -38,7 +38,7 @@ static bNodeSocketTemplate sh_node_bsdf_hair_principled_in[] = {
 	// 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_("Offset"),						2.f*((float)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_("Roughness Randomization"), 		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},



More information about the Bf-blender-cvs mailing list