Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 15 Aug 2017 16:51:25 +0000 (18:51 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 15 Aug 2017 16:51:25 +0000 (18:51 +0200)
commit84d33023ab4dea1424165a293d0fb8fd5f06c3da
tree959ac6e69117a7dc5d52adecec773f451199aca6
parentd56fb5b09dfdc06fd394059fd24dd579fe7e2e22
parent535e83687d3efc6431a47d259c94131029c1edf3
Merge branch 'master' into blender2.8
build_files/cmake/platform/platform_apple.cmake
source/creator/CMakeLists.txt