[Bf-blender-cvs] [66483e761fa] soc-2018-hair-shader: Add some help tooltips to the shader

[L. E. Segovia]

Commit: 66483e761fae5dd5a0c5484befe7e0a3a7837f4f
Author: L. E. Segovia
Date:   Fri Jun 1 23:29:45 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB66483e761fae5dd5a0c5484befe7e0a3a7837f4f

Add some help tooltips to the shader

Ref T54796

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

M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/makesrna/intern/rna_nodetree.c
M	source/tools

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

diff --git a/release/scripts/addons b/release/scripts/addons
index f6e3238de3e..4cb31f53101 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f6e3238de3e4d3526c64023b488a3d0ac177ae88
+Subproject commit 4cb31f53101bf29b9eefd7e0eb6f4f99c20a74a1
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 47470215783..f178e6c933a 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 474702157831f1a58bb50f5240ab8b1b02b6ba37
+Subproject commit f178e6c933a25c621a5cc7d92935b66cd2ec2f5d
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index f16b43ff030..bdfb166e32c 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3314,10 +3314,10 @@ static const EnumPropertyItem node_hair_items[] = {
 };
 
 static const EnumPropertyItem node_principled_hair_items[] = {
-	{SHD_PRINCIPLED_HAIR_DIRECT_ABSORPTION,     "ABSORPTION", 0, "Absorption coefficient",   ""},
-	{SHD_PRINCIPLED_HAIR_PHYSICAL,              "PHYSICAL",   0, "Physical",                 ""},
-	{SHD_PRINCIPLED_HAIR_REFLECTANCE,           "COLOR",      0, "Direct coloring",          ""},
-	{SHD_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION, "MELANIN",    0, "Melanin concentration",    ""},
+	{SHD_PRINCIPLED_HAIR_DIRECT_ABSORPTION,     "ABSORPTION", 0, "Absorption coefficient",   "Absorption coefficient", "Directly set the absorption coefficient sigma_a. This is not the most intuitive way to color hair."},
+	{SHD_PRINCIPLED_HAIR_PHYSICAL,              "PHYSICAL",   0, "Physical",                 "Physical",               "Like Absorption, but uses a  logarithmic mapping. For debugging purposes."},
+	{SHD_PRINCIPLED_HAIR_REFLECTANCE,           "COLOR",      0, "Direct coloring",          "Direct coloring",        "Choose the color of your preference, and the shader will approximate the absorption coefficient to render lookalike hair."},
+	{SHD_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION, "MELANIN",    0, "Melanin concentration",    "Melanin concentration",  "Define the melanin concentrations below to get the most realistic-looking hair. You can get the concentrations for different types of hair online."},
 	{0, NULL, 0, NULL, NULL}
 };
 
diff --git a/source/tools b/source/tools
index 116ae2c6e6b..5b3c5885a82 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 116ae2c6e6b5b39b75b628627a1b579a5ca259ea
+Subproject commit 5b3c5885a824927507f475a8779c49dd371bda94