[Bf-blender-cvs] [2af5f394886] soc-2018-hair-shader: Lift upper bounds of roughness/radial roughness

L. E. Segovia noreply at git.blender.org
Mon Jul 9 00:26:25 CEST 2018


Commit: 2af5f394886cb6b33a3bf6da4ac7bda2337f8e51
Author: L. E. Segovia
Date:   Sun Jul 8 22:23:54 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB2af5f394886cb6b33a3bf6da4ac7bda2337f8e51

Lift upper bounds of roughness/radial roughness

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

M	intern/cycles/kernel/closure/bsdf_hair_principled.h
M	release/scripts/addons
M	source/tools

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

diff --git a/intern/cycles/kernel/closure/bsdf_hair_principled.h b/intern/cycles/kernel/closure/bsdf_hair_principled.h
index f9a9d1dc3ba..69e4ce1d41c 100644
--- a/intern/cycles/kernel/closure/bsdf_hair_principled.h
+++ b/intern/cycles/kernel/closure/bsdf_hair_principled.h
@@ -186,8 +186,8 @@ ccl_device int bsdf_principled_hair_setup(ShaderData *sd, PrincipledHairBSDF *bs
 	// }
 
 	bsdf->type = CLOSURE_BSDF_HAIR_PRINCIPLED_ID;
-	bsdf->v = clamp(bsdf->v, 0.001f, 0.999f);
-	bsdf->s = clamp(bsdf->s, 0.001f, 0.999f);
+	bsdf->v = clamp(bsdf->v, 0.001f, 1.0f);
+	bsdf->s = clamp(bsdf->s, 0.001f, 1.0f);
 
 	/* Map from roughness_u and roughness_v to variance and scale factor. */
 	bsdf->v = sqr(0.726f*bsdf->v + 0.812f*sqr(bsdf->v) + 3.700f*pow20(bsdf->v));
diff --git a/release/scripts/addons b/release/scripts/addons
index 44cbc3d71a2..142ef5b432e 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 44cbc3d71a2e81b42bb1685825957b0255e8b369
+Subproject commit 142ef5b432e883f70fdd103e006f47393c6b3a18
diff --git a/source/tools b/source/tools
index 1909ca5d3fc..8ebcf630fcd 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 1909ca5d3fc204ecce24c4b3bfbf927942e9ec3a
+Subproject commit 8ebcf630fcd0131674d69cbf3ae30101bc3c8b62



More information about the Bf-blender-cvs mailing list