Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Fri, 21 Apr 2017 14:30:24 +0000 (16:30 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Fri, 21 Apr 2017 14:30:24 +0000 (16:30 +0200)
commitcc2d501642555616f3e8808bdbaa72f9c752e1a1
treea204ffc2ad092c8ab6464ce7e609f885e5c7eaef
parent111a53f74ccf2cd53e41d7597dfecbab041858a3
parent7e977470f3e3e082082debe8a8b266ffea8dada6
Merge branch 'master' into blender2.8
CMakeLists.txt
build_files/cmake/macros.cmake
source/blenderplayer/CMakeLists.txt
tests/python/CMakeLists.txt