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)
commit25b8eb4631e3a5004b4c21264115b3dbd3dbf2b3
tree0ba86434c930bac0e4a906677959638ec9980e53
parentb282716c3aae68d5fc781e7fc5df0241c3d91198
parente7c6b244c9db0892b4214f0795bec8c60d7ab4f0
Merge branch 'master' into blender2.8
GNUmakefile
build_files/build_environment/install_deps.sh
intern/cycles/kernel/kernel_path_state.h