Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 15 Jun 2018 14:32:31 +0000 (16:32 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 15 Jun 2018 14:32:31 +0000 (16:32 +0200)
1  2 
intern/cycles/render/shader.cpp

Simple merge