Merge branch 'master' into blender2.8

2018-02-23 19:02:49 +01:00
parent 0305fc30b3 0aec2dcd3a
commit a44b08a6c4
40 changed files with 688 additions and 692 deletions
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -272,6 +272,7 @@ shader_node_categories = [
        NodeItem("ShaderNodeHoldout", poll=object_cycles_shader_nodes_poll),
        NodeItem("ShaderNodeVolumeAbsorption", poll=eevee_cycles_shader_nodes_poll),
        NodeItem("ShaderNodeVolumeScatter", poll=eevee_cycles_shader_nodes_poll),
+        NodeItem("ShaderNodeVolumePrincipled"),
        NodeItem("ShaderNodeEeveeSpecular", poll=object_eevee_shader_nodes_poll),
        ]),
    ShaderNewNodeCategory("SH_NEW_TEXTURE", "Texture", items=[