Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 05:54:07 +0000 (15:54 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 05:54:07 +0000 (15:54 +1000)
commit2597cd39982100efeeb13b597f3e432ef9346d85
tree96b7cd824f5038d5a63ec025957e4503e544f95f
parent7eecc9407415e18eaab2ded2fcc883edbf58c633
parenta1651ddc98ec760e522ea2ea8169b726661fa2e6
Merge branch 'master' into blender2.8
CMakeLists.txt
build_files/build_environment/install_deps.sh
build_files/buildbot/config/blender_linux.cmake
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple.cmake
extern/CMakeLists.txt