Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Wed, 25 Oct 2017 20:04:01 +0000 (22:04 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Wed, 25 Oct 2017 20:04:01 +0000 (22:04 +0200)
commitf074a6dd2ea0eebaa62eef2ee40073599b999207
tree75f39d900e7962995e54e24db4397dbc27de928e
parent86899c1adf15797ff77c3d1389a0a059a0fdb997
parent171c4e982f7b6c93b534a48cfe8aba73dec78030
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_shader.cpp