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)
commitf60018e425ac5c488789ee15055f89f39e5cbb05
treee458a65f969fc161c39b829dac7f45c7a660209e
parentd415b5c7b85b07ce4e30e4dbe33491df23202cdc
parent84b02dc54a8c06e963a263e7232e41a993ab21c8
Merge branch 'master' into blender2.8
intern/cycles/render/nodes.cpp