Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 23 Nov 2018 11:11:44 +0000 (12:11 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 23 Nov 2018 11:11:44 +0000 (12:11 +0100)
commit920525c2164973ac029ba015a3cbcb3b7b119317
tree8e106e9a0856c4564cca346f42343d5865d88241
parent29f75dd7b8a6fae826082c035c99c089c2dc2954
parent956e58679ce6f381e4f069ba6c0628dc145083c4
Merge branch 'master' into blender2.8
build_files/cmake/macros.cmake