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)
1  2 
build_files/cmake/platform/platform_apple.cmake
source/creator/CMakeLists.txt

Simple merge