[Bf-blender-cvs] [aedb148ed4d] soc-2018-hair-shader: Merge branch 'master' into soc-2018-hair-shader

[L. E. Segovia]

Commit: aedb148ed4dd47d5a8491e3de0a207cdd3701e30
Author: L. E. Segovia
Date:   Wed Jul 4 01:30:45 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rBaedb148ed4dd47d5a8491e3de0a207cdd3701e30

Merge branch 'master' into soc-2018-hair-shader

Week 8 merge: fixed a typo in nodeitems_builtins

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index ceec8b139e3,92411aeb0ef..84fd1a040ac
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -245,8 -246,7 +246,8 @@@ shader_node_categories = 
          NodeItem("ShaderNodeVolumeAbsorption"),
          NodeItem("ShaderNodeVolumeScatter"),
          NodeItem("ShaderNodeVolumePrincipled"),
 +        NodeItem("ShaderNodeBsdfHairPrincipled", poll=object_shader_nodes_poll)
-         ]),
+     ]),
      ShaderNewNodeCategory("SH_NEW_TEXTURE", "Texture", items=[
          NodeItem("ShaderNodeTexImage"),
          NodeItem("ShaderNodeTexEnvironment"),