Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 27 Sep 2018 18:12:14 +0000 (20:12 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 27 Sep 2018 18:12:14 +0000 (20:12 +0200)
commit975a40dceb560a6bfc67b1562829acc541fa5716
tree9090ab25d04df359d24340bd6813816656726ad5
parent6baea955bf562399caa9c6186601815af29b584d
parentbd267b0332d900fe5e9c6248abe158e00598f24d
Merge branch 'master' into blender2.8
intern/cycles/app/CMakeLists.txt