Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Mar 2019 17:37:09 +0000 (18:37 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Mar 2019 17:37:09 +0000 (18:37 +0100)
1  2 
intern/cycles/render/shader.cpp

Simple merge