Merge branch 'master' into blender2.8
authorLukas Stockner <lukas.stockner@freenet.de>
Sun, 27 May 2018 15:26:59 +0000 (17:26 +0200)
committerLukas Stockner <lukas.stockner@freenet.de>
Sun, 27 May 2018 15:26:59 +0000 (17:26 +0200)
commit1863883a248faa1fcae4b99332c8d5e6d3957845
treeadb53f3624e5e90b70e48e32c3b0a89c749fe94e
parent47f2b3b80d748ccfe1192dbd7c3176be88814da1
parentedce44d6931586fad3cee019db762d54e73a886a
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_shader.cpp
intern/cycles/blender/blender_util.h
intern/cycles/render/light.cpp