Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 11 Dec 2018 14:18:43 +0000 (15:18 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 11 Dec 2018 14:18:43 +0000 (15:18 +0100)
1  2 
intern/cycles/render/nodes.cpp

Simple merge