Merge branch 'master' into blender2.8

2018-05-27 11:06:29 +02:00
parent 474971f3d8 bc3727a943
commit 9a74b60367
69 changed files with 1864 additions and 375 deletions
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -229,6 +229,7 @@ shader_node_categories = [
        NodeItem("ShaderNodeTexChecker"),
        NodeItem("ShaderNodeTexBrick"),
        NodeItem("ShaderNodeTexPointDensity"),
+        NodeItem("ShaderNodeTexIES"),
        ]),
    ShaderNodeCategory("SH_NEW_OP_COLOR", "Color", items=[
        NodeItem("ShaderNodeMixRGB"),