Commit: 332b2d6206c128bd7ac2474c8b80a55a1fcc64af
Author: L. E. Segovia
Date: Fri Jun 8 09:51:16 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB332b2d6206c128bd7ac2474c8b80a55a1fcc64af
Randomization is (currently) only available for melanin
===================================================================
M source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.c
M source/tools
===================================================================
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 95e80f31adb..9bb59c58903 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
@@ -105,7 +105,7 @@ static void node_shader_update_hair_principled(bNodeTree
*UNUSED(ntree), bNode *
}
}
else if (STREQ(sock->name, "Color Randomization")) {
- if ((parametrization ==
SHD_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION) || (parametrization ==
SHD_PRINCIPLED_HAIR_REFLECTANCE)){
+ if (parametrization ==
SHD_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION){
sock->flag &= ~SOCK_UNAVAIL;
}
else {
diff --git a/source/tools b/source/tools
index 48736838d42..fca325137b6 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 48736838d421447d5e4d67ccd59bf1d22dcc85d9
+Subproject commit fca325137b6ee2dfd0930ca87684ccf30703554f
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
