Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 7 Aug 2017 15:48:14 +0000 (17:48 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 7 Aug 2017 15:48:14 +0000 (17:48 +0200)
1  2 
GNUmakefile
build_files/build_environment/install_deps.sh
intern/cycles/kernel/kernel_path_state.h

diff --cc GNUmakefile
Simple merge