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)
1  2 
intern/cycles/blender/blender_shader.cpp
intern/cycles/blender/blender_util.h
intern/cycles/render/light.cpp

Simple merge
Simple merge